done
}
+echo "Removing possible leftovers from update-pciids runs"
+rm -f "${target}"/wget-log*
+
echo "Cleaning log and cache directories"
nuke ${target}/var/log ${target}/var/cache
zero ${target}/var/account/pacct \
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
+ rm -f "${target}"/etc/resolvconf/resolv.conf.d/original
+ rm -f "${target}"/etc/resolv.conf
+
+ # avoid "/etc/resolvconf/update.d/libc: Warning: /etc/resolv.conf is not a
+ # symbolic link to /etc/resolvconf/run/resolv.conf" for resolvconf versions
+ # before 1.80
+ RESOLVCONF_VERSION=$($ROOTCMD dpkg-query -W -f='${Version}\n' resolvconf || true)
+ echo "-> Identified resolvconf version '${RESOLVCONF_VERSION}'"
+ if dpkg --compare-versions "${RESOLVCONF_VERSION}" lt 1.80 ; then
+ echo "-> Installing resolvconf symlink for versions <1.80"
+ ln -s /etc/resolvconf/run/resolv.conf "${target}"/etc/resolv.conf
+ else
+ echo "-> Installing resolvconf symlink for versions >=1.80"
+ ln -s /run/resolvconf/resolv.conf "${target}"/etc/resolv.conf
fi
- 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
+# that are present on the build system to the live system
+if [ -f "${target}/etc/mdadm/mdadm.conf" ] ; then
+ echo "Found /etc/mdadm/mdadm.conf, getting rid of any possible enabled ARRAY settings."
+ sed -i '/^ARRAY/d' "${target}/etc/mdadm/mdadm.conf"
fi
if ! $ROOTCMD test -x /usr/bin/updatedb ; then
$ROOTCMD updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
fi
+if [ -r "${target}/etc/machine-id" ] ; then
+ echo "Removing /etc/machine-id generated by systemd"
+ rm -f "$target/etc/machine-id"
+fi
+
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2