From 3900f5d2c4f7c11478ecac404cd82b66b77564b9 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 14 Mar 2018 13:29:37 +0100
Subject: [PATCH] GRMLBASE/98-clean-chroot: execute resolvconf workarounds also
 for systemd
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

/etc/resolvconf/resolv.conf.d/original leaks data from the environment
the ISO was built in, and /etc/resolv.conf should be empty and be filled
with data from DHCP.

Thanks: András Korn
---
 .../fai/config/scripts/GRMLBASE/98-clean-chroot    | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 2e78bf7..88cba00 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -186,27 +186,23 @@ fi
 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."
-  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
+  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
-- 
2.1.4