From f37fcf9de4b88fe70a10fbedf9c2b649e8151c27 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 20 May 2020 14:29:31 +0200 Subject: [PATCH] Move scripts/GRMLBASE/40-deborphan towards DEBORPHAN class as file 10-whitelist If the DEBORPHAN class is used before the GRMLBASE class when invoking grml-live, then any whitelisting executed via scripts/GRMLBASE/40-deborphan will happen too late, which is not obvious and surprising. Instead let's move scripts/GRMLBASE/40-deborphan towards the DEBORPHAN class and name it as "10-whitelist". --- debian/grml-live.maintscript | 1 + .../scripts/{GRMLBASE/40-deborphan => DEBORPHAN/10-whitelist} | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) rename etc/grml/fai/config/scripts/{GRMLBASE/40-deborphan => DEBORPHAN/10-whitelist} (67%) diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript index dcf169f..5ab930d 100644 --- a/debian/grml-live.maintscript +++ b/debian/grml-live.maintscript @@ -1,3 +1,4 @@ rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~ rm_conffile /etc/grml/fai/config/files/etc/systemd/system/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~ +rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan 0.35.0~ diff --git a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist similarity index 67% rename from etc/grml/fai/config/scripts/GRMLBASE/40-deborphan rename to etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist index 04662ed..aa52ab0 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan +++ b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist @@ -1,6 +1,6 @@ #!/bin/bash -# Filename: ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/40-deborphan -# Purpose: configure packages for deborphan (usually exception rules) +# Filename: ${GRML_FAI_CONFIG}/config/scripts/DEBORPHAN/10-whitelist +# Purpose: whitelist packages to keep with deborphan # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. @@ -9,8 +9,8 @@ set -u set -e -# workaround for dnsutils transitional package, drop as soon as bind9-dnsutils -# is available in all supported releases +# workaround for dnsutils transitional package, we can drop this as soon as the +# bind9-dnsutils package is available in all our supported Debian releases if [[ -r "${target}/usr/share/doc/dnsutils" ]] && [ -x "${target}/usr/bin/deborphan" ] ; then $ROOTCMD deborphan --add-keep dnsutils || /bin/true fi -- 2.1.4