Rework policy-rc.d handling in updatebase once again

[grml-live.git] / etc / grml / fai / config / hooks / updatebase.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 6187260..0c46d00 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -7,10 +7,12 @@
 ################################################################################
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   # we want to use our own sources.list:
+
+   ## we want to use our own sources.list:
    skiptask updatebase
-   # make sure we don't start any daemons - removed
-   # later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+
+   ## 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
@@ -19,8 +21,9 @@ 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
+   [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true
 fi
 
 ## END OF FILE #################################################################