X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=f293e910edea187ec5736c5604b248bbc388132a;hp=4a5e0cb5d28f1175b5d66a1415c7f52a43020f2d;hb=acf12d4123bd68f;hpb=422c49bc62f3298bbc47ec2f5aae8ceb300db4a6

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 4a5e0cb..f293e91 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -183,29 +183,13 @@ 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
   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
+  rm -f "${target}"/etc/resolvconf/resolv.conf.d/original
+  rm -f "${target}"/etc/resolv.conf
+  ln -s /run/resolvconf/resolv.conf "${target}"/etc/resolv.conf
 fi
 
 # make sure we don't leak any mdadm configurations