Add back hald for Xorg input device queries (#553780)

This reverts commit 13a27933b4b651317deec74cc80daaab5041d206.  Xorg is
asking hal for input device information.

2 files changed, 25 insertions, 1 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index fd4ab1112..b49c381b4 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -562,12 +562,14 @@ makeinitrd() {
     mkdir -p $MBD_DIR/usr/libexec
     mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager
     mkdir -p $MBD_DIR/usr/share/dbus-1/system-services
+    mkdir -p $MBD_DIR/var/cache/hald
     mkdir -p $MBD_DIR/var/lib/dbus
     mkdir -p $MBD_DIR/var/lib/dhclient
     mkdir -p $MBD_DIR/etc/dhcp
     mkdir -p $MBD_DIR/var/lock/rpm
     mkdir -p $MBD_DIR/var/run
     mkdir -p $MBD_DIR/var/run/dbus
+    mkdir -p $MBD_DIR/var/run/hald
     mkdir -p $MBD_DIR/var/run/NetworkManager
     mkdir -p $MBD_DIR/etc/dbus-1/system.d
     mkdir -p $MBD_DIR/etc/modprobe.d
@@ -577,6 +579,8 @@ makeinitrd() {
     mkdir -p $MBD_DIR/usr/share/polkit-1/actions
     mkdir -p $MBD_DIR/etc/polkit-1/localauthority.conf.d
     mkdir -p $MBD_DIR/etc/polkit-1/nullbackend.conf.d
+    mkdir -p $MBD_DIR/etc/hal/fdi
+    mkdir -p $MBD_DIR/usr/share/hal/fdi
     mkdir -p $MBD_DIR/usr/share/hwdata
     mkdir -p $MBD_DIR/etc/rc.d/init.d
     mkdir -p $MBD_DIR/usr/sbin
@@ -712,6 +716,18 @@ makeinitrd() {
     cp -a $IMGPATH/usr/share/hwdata/pci.ids $MBD_DIR/usr/share/hwdata/pci.ids
     cp -a $IMGPATH/usr/share/hwdata/usb.ids $MBD_DIR/usr/share/hwdata/usb.ids
 
+    # hal
+    instbin $IMGPATH /usr/sbin/hald $MBD_DIR /sbin/hald
+    ( cd $IMGPATH/usr/libexec
+      for f in hald-runner hald-generate-fdi-cache hal*storage* ; do
+          instbin $IMGPATH /usr/libexec/$f $MBD_DIR /usr/libexec/$f
+      done
+    )
+    touch $MBD_DIR/var/run/hald.acl-list
+    cp -a $IMGPATH/usr/share/hal/fdi/* $MBD_DIR/usr/share/hal/fdi
+    cp -a $IMGPATH/etc/hal/fdi/* $MBD_DIR/etc/hal/fdi
+    cp -a $IMGPATH/etc/dbus-1/system.d/hal.conf $MBD_DIR/etc/dbus-1/system.d
+
     # PolicyKit
     ( cd $IMGPATH/etc/polkit-1
       cp -a localauthority.conf.d/50-localauthority.conf $MBD_DIR/etc/polkit-1/localauthority.conf.d
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 7a7f4ce55..a43301aeb 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -166,7 +166,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda
     elfutils-libelf expat fcoe-utils
     firstboot fontconfig fonts-ISO8859-2 freetype gail gawk gdb-gdbserver
     gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf
-    gnome-themes gpm grep gtk2 gtk2-engines
+    gnome-themes gpm grep gtk2 gtk2-engines hal
     hdparm hwdata initscripts iproute iputils iscsi-initiator-utils
     jfsutils keyutils-libs krb5-libs libICE libSM libX11 libXau
     libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft
@@ -354,6 +354,7 @@ etc/fcoe
 etc/fonts
 etc/group
 etc/gtk-2.0/gtkrc*
+etc/hal
 etc/hosts
 etc/im_palette.pal
 etc/imrc
@@ -479,6 +480,7 @@ usr/$LIBDIR/gtk-2.0/*/loaders/*png*
 usr/$LIBDIR/gtk-2.0/*/loaders/*xpm*
 usr/$LIBDIR/gtk-2.0/immodules
 usr/$LIBDIR/kernel-wrapper/*
+usr/$LIBDIR/hal
 usr/$LIBDIR/libuser/*
 usr/$LIBDIR/pango
 usr/$LIBDIR/python?.?
@@ -514,6 +516,7 @@ usr/bin/humount
 usr/bin/killall
 usr/bin/logger
 usr/bin/lsattr*
+usr/bin/lshal
 usr/bin/maketilo
 usr/bin/md5sum
 usr/bin/mini-wm
@@ -564,6 +567,7 @@ usr/lib/yum-plugins/blacklist.py*
 usr/lib/yum-plugins/fedorakmod.py*
 usr/lib/yum-plugins/whiteout.py*
 usr/libexec/convertdb1
+usr/libexec/hal*
 usr/libexec/nm-crash-logger
 usr/libexec/nm-dhcp-client.action
 usr/libexec/nm-dispatcher.action
@@ -581,6 +585,7 @@ usr/sbin/fcoemon
 usr/sbin/fbset
 usr/sbin/genhomedircon
 usr/sbin/gptsync
+usr/sbin/hald
 usr/sbin/lvm
 usr/sbin/prelink
 usr/sbin/semodule
@@ -622,6 +627,7 @@ usr/share/fonts/madan/Madan.ttf
 usr/share/fonts/un-core/UnDotum.ttf
 usr/share/fonts/*/VL-Gothic-Regular.ttf
 usr/share/fonts/smc/Meera*.ttf
+usr/share/hal
 usr/share/hwdata/MonitorsDB
 usr/share/hwdata/pci.ids
 usr/share/hwdata/usb.ids
@@ -660,8 +666,10 @@ usr/share/xorg/extramodes
 usr/share/xorg/vesamodes
 usr/share/zenity
 usr/share/zoneinfo
+var/cache/hald
 var/lib/polkit-1
 var/lib/dbus
+var/lib/hal
 var/run/dbus
 EOF