updatebase.GRMLBASE: do no longer skiptask updatebase and exit in softupdate action

We want to use the apt configuration as provided via fcopy.

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 4bed873..108b1ec 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -27,9 +27,6 @@ fi
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
 

-   ## we want to use our own sources.list:
-   skiptask updatebase
-

    ## based on FAI's lib/updatebase:
    # some packages must access /proc even in chroot environment
    if ! [ -d $FAI_ROOT/proc/1 ] ; then
    ## based on FAI's lib/updatebase:
    # some packages must access /proc even in chroot environment
    if ! [ -d $FAI_ROOT/proc/1 ] ; then


@@ -51,8 +48,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    if [ -n "$BUILD_ONLY" ] ; then
       skiptask instsoft || true
    fi
    if [ -n "$BUILD_ONLY" ] ; then
       skiptask instsoft || true
    fi

-
-   exit # make sure we don't continue behind the following "fi"

 fi
 
 if [ -n "$BOOTSTRAP_ONLY" ] ; then
 fi
 
 if [ -n "$BOOTSTRAP_ONLY" ] ; then


@@ -60,9 +55,6 @@ if [ -n "$BOOTSTRAP_ONLY" ] ; then
   skiptask configure
 fi
 
   skiptask configure
 fi
 

-# no softupdate but updating chroot e.g. based on ${GRML_FAI_CONFIG}/basefiles/*
-echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
-

 # work around #632624: udev fails to install on systems with old kernel versions
 if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
   echo "Working around udev package bug, creating /etc/udev/kernel-upgrade"
 # work around #632624: udev fails to install on systems with old kernel versions
 if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
   echo "Working around udev package bug, creating /etc/udev/kernel-upgrade"