X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=108b1ec8c85b83f70f132de7c191bc138f4d412a;hb=d338d0cc0f1a78f85e40e2fdf91476b780fa13ff;hp=c7f343cff115a2470166de4341323a6e9ef8d6cf;hpb=c9141f43791a61b6bce79fa3963791f96dd78f04;p=grml-live.git diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index c7f343c..108b1ec 100755 --- 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" - ## 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 @@ -51,8 +48,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 +55,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" @@ -70,7 +62,7 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then fi # install all apt related files -fcopy -v -r /etc/apt +fcopy -B -v -r /etc/apt # install Grml gpg key: $ROOTCMD apt-key add /etc/apt/grml.key