X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=3a7b9affc29578893b84e81cb7b80ce91e276bfb;hp=4bed8739652b01479d4a2525b46ce305bbc4f540;hb=f4e1966f03cf049bf9f927540a774c38eb31a8bd;hpb=2861f16a0d24d2c7f6a7f43abf6710fae3dbc286 diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index 4bed873..3a7b9af 100755 --- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE +++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE @@ -27,7 +27,7 @@ fi 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: + # otherwise we're running 'aptitude update' even on with -b option skiptask updatebase ## based on FAI's lib/updatebase: @@ -51,8 +51,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then 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 @@ -60,9 +58,6 @@ if [ -n "$BOOTSTRAP_ONLY" ] ; then 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"