X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FDEBORPHAN%2F10-whitelist;h=4a7d8079d9559e7a22f9caeea8a559fddabc0fcd;hp=0c145f71dfc347816879c89ba598137598bed269;hb=HEAD;hpb=cd7c095b965f6cab4801b737cf5c8954bce1fa4a

diff --git a/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
index 0c145f7..ec97fc4 100755
--- a/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
+++ b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
@@ -14,8 +14,27 @@ set -e
 if [[ -r "${target}/usr/share/doc/dnsutils" ]] && [ -x "${target}/usr/bin/deborphan" ] ; then
   echo "Adding dnsutils to deborphan whitelist"
   # workaround for https://bugs.debian.org/929273 ("fseek on /var/lib/deborphan/keep: Invalid argument")
-  $ROOTCMD touch /var/lib/deborphan/keep
-  $ROOTCMD deborphan --add-keep dnsutils
+  if ! [ -f "${target}"/var/lib/deborphan/keep ] ; then
+    printf 'dnsutils\n' > "${target}"/var/lib/deborphan/keep
+  elif grep -q '^dnsutils$' "${target}"/var/lib/deborphan/keep ; then
+    : # entry already present, avoid duplicates
+  else
+    printf 'dnsutils\n' >> "${target}"/var/lib/deborphan/keep
+  fi
+fi
+
+# workaround for bsdmainutils transitional package, we can drop this as soon as the
+# bsdextrautils + ncal packages are available in all our supported Debian releases
+if [[ -r "${target}/usr/share/doc/bsdmainutils" ]] && [ -x "${target}/usr/bin/deborphan" ] ; then
+  echo "Adding bsdmainutils to deborphan whitelist"
+  # workaround for https://bugs.debian.org/929273 ("fseek on /var/lib/deborphan/keep: Invalid argument")
+  if ! [ -f "${target}"/var/lib/deborphan/keep ] ; then
+    printf 'bsdmainutils\n' > "${target}"/var/lib/deborphan/keep
+  elif grep -q '^bsdmainutils$' "${target}"/var/lib/deborphan/keep ; then
+    : # entry already present, avoid duplicates
+  else
+    printf 'bsdmainutils\n' >> "${target}"/var/lib/deborphan/keep
+  fi
 fi
 
 ## END OF FILE #################################################################