X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=51a0e7736a4722891efb945fdd545c60c8ab68e7;hp=e5e680038c255aa1f50c4a8014644101d9b22cdd;hb=5a00bf358eac8ba6c00666f3fa6670d9c3f58b9b;hpb=6d5124d02e3912ac0ca53c0f0af92ef9ebceae23

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index e5e6800..51a0e77 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -21,28 +21,31 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
    if [ -r /etc/resolv.conf ] ; then
-     if [ -d $target/etc/resolvconf/run ] ; then # resolvconf without /run
-       # sanity check to avoid "input file is output file",
-       # see http://bts.grml.org/grml/issue984
-       if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
-         cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-       else
-         echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
-         echo "       Looks like something is wrong, please fix manually." >&2
-         exit 1
-       fi
-     elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run
-       # /etc/resolvconf/run symlinks to /run/resolvconf
-       mkdir -p $target/run/resolvconf
-       cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
-     else # no resolvconf installed in chroot
-       if ! [ -L $target/etc/resolv.conf ] ; then
-         cat /etc/resolv.conf >> $target/etc/resolv.conf
-       else
-         echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
-         exit 1
-       fi
-     fi
+     case "$(chroot $target readlink -f /etc/resolv.conf)" in
+       /run/*) # resolvconf with /run
+         mkdir -p $target/run/resolvconf
+         cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
+         ;;
+       /lib/*) # resolvconf without /run
+         # sanity check to avoid "input file is output file",
+         # see http://bts.grml.org/grml/issue984
+         if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
+           cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+         else
+           echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
+           echo "       Looks like something is wrong, please fix manually." >&2
+           exit 1
+         fi
+         ;;
+       *) # no resolvconf
+         if ! [ -L $target/etc/resolv.conf ] ; then
+           cat /etc/resolv.conf >> $target/etc/resolv.conf
+         else
+           echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+           exit 1
+         fi
+         ;;
+     esac
    fi
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
@@ -60,15 +63,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
 //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
 EOF
 
-   # run it on our own, as updatebase is used at the wrong stage for our needs,
-   # see ${GRML_FAI_CONFIG}/hooks/updatebase.GRMLBASE
-   # the apt-get update might return an error if there's for example
-   # a hashsum mismatch on Debian mirror sources, we might want to continue
-   # but should warn the user
-   if ! $ROOTCMD apt-get update ; then
-      echo "Warning: there was an error executing apt-get update, continuing anyway."
-   fi
-
    # work around /etc/kernel/postinst.d/zz-update-grub failing
    # inside openvz environment, see #597084
    if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
@@ -85,14 +79,21 @@ EOF
       $ROOTCMD apt-get -y install aptitude
    fi
 
+   # make sure we can upgrade automatically,
+   # even with unsigned repos, but only if user wants it
+   if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then
+     APTGET_OPTS="${APTGET_OPTS:-} --allow-unauthenticated"
+     APTITUDE_OPTS="${APTITUDE_OPTS:-} --allow-untrusted"
+   fi
+
    if $ROOTCMD test -x /usr/bin/aptitude ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
-         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y safe-upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS safe-upgrade
       else
-         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS upgrade
       fi
    else
-      APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y upgrade
+      APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y $APTGET_OPTS --force-yes upgrade
    fi
 
    exit # make sure we don't continue behind the following "fi"