Merge remote-tracking branch 'origin/github/pr/148'

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 98-clean-chroot

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 2e78bf7..3b07e5e 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -101,7 +101,7 @@ rm -rf --one-file-system $target/etc/sysconfig/* \
 
 # remove only "temporary" or saved files in the given directories
 nuke(){
-  for i in $(find "$@" -name \*.gz -o -name \*.bz2 -o -name \*.0 2>/dev/null); do
+  for i in $(find "$@" -name \*.gz -o -name \*.bz2 -o -name \*.xz -o -name \*.0 2>/dev/null); do
     rm -f --one-file-system "$i"
   done
 }
@@ -113,6 +113,9 @@ zero(){
   done
 }
 
+echo "Removing possible leftovers from update-pciids runs"
+rm -f "${target}"/wget-log*
+
 echo "Cleaning log and cache directories"
 nuke ${target}/var/log       ${target}/var/cache
 zero ${target}/var/account/pacct \
@@ -180,33 +183,26 @@ if ! [ -r $target/etc/ld.so.nohwcap ] ; then
    touch $target/etc/ld.so.nohwcap
 fi
 
-# installation of resolvconf in chroot *with* /proc
-# is different from an installation without /proc,
-# so make sure it is OK in any case
 if ! [ -d $target/etc/resolvconf ] ; then
   echo "Warning: resolvconf not installed"
 else
-  if ! ifclass FILE_RC ; then
-    echo "Skipping resolvconf workaround because FILE_RC class not in use."
+  echo "Setting up resolvconf"
+  rm -f "${target}"/etc/resolvconf/resolv.conf.d/original
+  rm -f "${target}"/etc/resolv.conf
+
+  # avoid "/etc/resolvconf/update.d/libc: Warning: /etc/resolv.conf is not a
+  # symbolic link to /etc/resolvconf/run/resolv.conf" for resolvconf versions
+  # before 1.80
+  RESOLVCONF_VERSION=$($ROOTCMD dpkg-query -W -f='${Version}\n' resolvconf || true)
+  echo "-> Identified resolvconf version '${RESOLVCONF_VERSION}'"
+  if dpkg --compare-versions "${RESOLVCONF_VERSION}" lt 1.80 ; then
+    echo "-> Installing resolvconf symlink for versions <1.80"
+    ln -s /etc/resolvconf/run/resolv.conf "${target}"/etc/resolv.conf
   else
-    echo "Setting up resolvconf"
-    if [ ! -L $target/etc/resolvconf/run ] ; then # resolvconf without symlink?!
-      RESOLV_CONF=/etc/resolvconf/run
-      rm -rf   ${target}/${RESOLV_CONF}
-      mkdir -p ${target}/${RESOLV_CONF}
-
-      touch ${target}/${RESOLV_CONF}/enable-updates
-      mkdir ${target}/${RESOLV_CONF}/interface
-
-      cat > ${target}/${RESOLV_CONF}/resolv.conf << EOF
-# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
-#     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-EOF
-    fi
-    rm -f ${target}/etc/resolvconf/resolv.conf.d/original
-    rm -f ${target}/etc/resolv.conf
-    $ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
+    echo "-> Installing resolvconf symlink for versions >=1.80"
+    ln -s /run/resolvconf/resolv.conf "${target}"/etc/resolv.conf
   fi
+
 fi
 
 # make sure we don't leak any mdadm configurations