X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fgrml%2Fgrml_cleanup_chroot;h=074e60e8dde6ac1caecc92335cd7473f6629dadf;hp=f6fc85fb62287c78c90dd22cfb0920db8d5e229a;hb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9;hpb=e1e1975bb96a77608640a839f9ff14cab57203af

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index f6fc85f..074e60e 100755
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -100,13 +100,6 @@ else
   ewarn "localepurg not available" ; eend 0
 fi
 
-if [ -d /var/lib/backuppc/pc/localhost/ ] ; then
-  einfo "Cleaning /var/lib/backuppc/pc/localhost/"
-  rm -rf /var/lib/backuppc/pc/localhost/* ; eend $?
-else
-  ewarn "backuppc not installed" ; eend 0
-fi
-
 # find /var -name \*.pid
 einfo "Removing pid-files"
   find /var/run -name \*.pid -exec rm {} \;
@@ -313,10 +306,17 @@ fi
 
 # installation of resolvconf in chroot *with* /proc
 # is different from an installation without /proc,
-# so make sure it is OK in any case; don't use /dev/shm
+# so make sure it is OK in any case
 if [ -d /etc/resolvconf ] ; then
-   rm -rf /etc/resolvconf/run
-   mkdir /etc/resolvconf/run
+  if [ -L /etc/resolvconf/run ] ; then # resolvconf with /run
+    # /etc/resolvconf/run symlinks to /run/resolvconf
+    rm -rf /run/resolvconf
+    mkdir -p /run/resolvconf
+  else # no /run present
+    rm -rf /etc/resolvconf/run
+    mkdir /etc/resolvconf/run
+  fi
+
    touch /etc/resolvconf/run/enable-updates
    mkdir /etc/resolvconf/run/interface
    cat > /etc/resolvconf/run/resolv.conf << EOF