[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 2/2] Revert "Add back hald for Xorg input device queries (#553780)"



This reverts commit 829bd5980b4c386de48b1a8274b499fe97c1b7dc.  X was the only
thing still using hal, and it no longer is.
---
 loader/loader.c      |    6 ------
 scripts/mk-images    |   16 ----------------
 scripts/upd-instroot |   10 +---------
 3 files changed, 1 insertions(+), 31 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index b42eb71..95d07be 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2066,12 +2066,6 @@ int main(int argc, char ** argv) {
 
     busProbe(FL_NOPROBE(flags));
 
-    /* HAL daemon */
-    if (fork() == 0) {
-        execl("/sbin/hald", "/sbin/hald", "--use-syslog", NULL);
-        doExit(1);
-    }
-
     /* Disable all network interfaces in NetworkManager by default */
 #if !defined(__s390__) && !defined(__s390x__)
     int i;
diff --git a/scripts/mk-images b/scripts/mk-images
index 66ac3c1..07d8465 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -563,14 +563,12 @@ makeinitrd() {
     mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager
     mkdir -p $MBD_DIR/$LIBDIR/rsyslog
     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
@@ -580,8 +578,6 @@ 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
@@ -723,18 +719,6 @@ 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 80de4a0..584240e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -167,7 +167,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 hal
+    gnome-themes gpm grep gtk2 gtk2-engines
     hdparm hwdata initscripts iproute iputils iscsi-initiator-utils
     jfsutils kpartx keyutils-libs krb5-libs libICE libSM libX11 libXau
     libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft
@@ -362,7 +362,6 @@ etc/fcoe
 etc/fonts
 etc/group
 etc/gtk-2.0/gtkrc*
-etc/hal
 etc/hosts
 etc/im_palette.pal
 etc/imrc
@@ -494,7 +493,6 @@ 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?.?
@@ -531,7 +529,6 @@ 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
@@ -583,7 +580,6 @@ 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
@@ -601,7 +597,6 @@ usr/sbin/fcoemon
 usr/sbin/fbset
 usr/sbin/genhomedircon
 usr/sbin/gptsync
-usr/sbin/hald
 usr/sbin/lvm
 usr/sbin/prelink
 usr/sbin/semodule
@@ -643,7 +638,6 @@ 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
@@ -682,10 +676,8 @@ 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
 
-- 
1.6.5.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]