From: Michael Prokop <mika@grml.org>
Date: Fri, 13 Jan 2017 14:00:07 +0000 (+0100)
Subject: Skip resolvconf magic when using systemd
X-Git-Tag: v0.28.0~6
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=c55319302f73803fb32033335e647c60f65204f9

Skip resolvconf magic when using systemd

Enable resolvconf.service instead of running all the magic inside
the 98-clean-chroot script.
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 88cba00..2e78bf7 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -186,23 +186,27 @@ fi
 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
+  if ! ifclass FILE_RC ; then
+    echo "Skipping resolvconf workaround because FILE_RC class not in use."
+  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
   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
 fi
 
 # make sure we don't leak any mdadm configurations