X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=ea1cfd083927483519ee593788121521cafb8e5f;hp=51a0e7736a4722891efb945fdd545c60c8ab68e7;hb=895b6b6202b913147e0b583523c6f174f93fdad4;hpb=db5741b5b41210da401504a3493d9a284da32e9c

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 51a0e77..ea1cfd0 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -20,33 +20,10 @@ fi
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
-   if [ -r /etc/resolv.conf ] ; then
-     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
+   # /etc/resolv.conf is usually a symlink, pointing out of the chroot.
+   # Make it a file with known contents.
+   rm -f "${target}"/etc/resolv.conf
+   cat /etc/resolv.conf >> "$target"/etc/resolv.conf
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
       sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
@@ -79,6 +56,10 @@ EOF
       $ROOTCMD apt-get -y install aptitude
    fi
 
+   # Update package lists (so they exist at all), so we actually can
+   # install software.
+   $ROOTCMD apt-get update
+
    # make sure we can upgrade automatically,
    # even with unsigned repos, but only if user wants it
    if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then