X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F96-apt-listbugs;h=65a1f530528719b0297e70e128ba81b50a9d53cb;hp=bbe6117309e4e15b547cb61c1a7b221fec8c3a8a;hb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9;hpb=16a29e1cd80caf1c63430038e653be3fa4258e0a

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index bbe6117..65a1f53 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -22,22 +22,26 @@ if ifclass RELEASE ; then
   [ -n "$HOSTNAME" ] || HOSTNAME=grml
 
   if [ -r /etc/resolv.conf ] ; then
-    if [ -d $target/etc/resolvconf/run ] ; then # resolvconf
+    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
+	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
+	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
+	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
+	echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+	exit 1
       fi
     fi
   fi