diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-11-09 10:55:07 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-11-12 15:58:13 -1000 |
| commit | 13a27933b4b651317deec74cc80daaab5041d206 (patch) | |
| tree | cc6feaabd13162acf53b2968438b33d6d87588c5 /scripts/mk-images | |
| parent | 4e65b68c709924d3548d187ad0784996cdbb55f4 (diff) | |
| download | anaconda-13a27933b4b651317deec74cc80daaab5041d206.tar.gz anaconda-13a27933b4b651317deec74cc80daaab5041d206.tar.xz anaconda-13a27933b4b651317deec74cc80daaab5041d206.zip | |
Remove last references to hal.
We don't need hal anymore, so remove it from the initrd.img generation
and stop loader from starting up hald.
Diffstat (limited to 'scripts/mk-images')
| -rwxr-xr-x | scripts/mk-images | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index d8e94f56f..aefc5b0b2 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -557,14 +557,12 @@ 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 @@ -574,8 +572,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 @@ -711,18 +707,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 |