Drop unnecessary policy-rc.d handler from hooks/updatebase.GRMLBASE and scripts/GRMLB...

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index b063b50..cb56f07 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -33,17 +33,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    [ -f /etc/init.d/udev ] && mount --bind /dev $FAI_ROOT/dev
    mount -t devpts devpts $FAI_ROOT/dev/pts
 
    [ -f /etc/init.d/udev ] && mount --bind /dev $FAI_ROOT/dev
    mount -t devpts devpts $FAI_ROOT/dev/pts
 

-   ## make sure we don't start any daemons - removed
-   ## later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
-   if ! [ -r $target/usr/sbin/policy-rc.d ] ; then
-      cat > $target/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-# FAI_ACTION=updatebase
-exit 101
-EOF
-      chmod 755 $target/usr/sbin/policy-rc.d
-   fi
-

    # skip the task if we want to build a new ISO only:
    [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true
 
    # skip the task if we want to build a new ISO only:
    [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index ae2d0c1..7d1239a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -8,14 +8,6 @@
 
 set -e
 
 
 set -e
 

-# check for policy-rc.d workaround of
-# /etc/grml/fai/config/hooks/updatebase.GRMLBASE
-if [ -r $target/usr/sbin/policy-rc.d ] ; then
-   if grep -q 'FAI_ACTION=updatebase' $target/usr/sbin/policy-rc.d ; then
-      rm -f $target/usr/sbin/policy-rc.d
-   fi
-fi
-

 # remove some big directories when using class LATEX_CLEANUP:
 if ifclass LATEX_CLEANUP ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup $target/root/
 # remove some big directories when using class LATEX_CLEANUP:
 if ifclass LATEX_CLEANUP ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup $target/root/