X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=eb0204acfb719ccf846cbd8a97c29650bbc52c30;hp=f5c22d8c1d1d670e6e98d24b2a07e5c9b08543ad;hb=d039e207a6fea49a966168e7d31487b86840af11;hpb=4585f1e73a919832d6431f5333821dae6f0e411d diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index f5c22d8..eb0204a 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -6,6 +6,11 @@ # License: This file is licensed under the GPL v2 or any later version. ################################################################################ +FILE_RC=false +if ifclass FILE_RC ; then + FILE_RC=true +fi + set -u set -e @@ -59,14 +64,17 @@ EOF # install software. $ROOTCMD apt-get update + if $FILE_RC ; then + echo "Installing file-rc as FILE_RC class is enabled." + # newer aptitude versions won't remove essential packages using + # 'aptitude -f -y install file-rc' anymore, therefore force it: + $ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc systemd-sysv- + fi + if ! $ROOTCMD test -x /usr/bin/aptitude ; then $ROOTCMD apt-get -y install aptitude fi - # newer aptitude versions won't remove essential packages using - # 'aptitude -f -y install file-rc' anymore, therefore force it: - $ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc - # make sure we can upgrade automatically, # even with unsigned repos, but only if user wants it if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then @@ -118,9 +126,12 @@ if ! $ROOTCMD apt-get update ; then echo "Warning: there was an error executing apt-get update, continuing anyway." >&2 fi -# newer aptitude versions won't remove essential packages using -# 'aptitude -f -y install file-rc' anymore, therefore force it via: -$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc +if $FILE_RC ; then + echo "Installing file-rc as FILE_RC class is enabled." + # newer aptitude versions won't remove essential packages using + # 'aptitude -f -y install file-rc' anymore, therefore force it via: + $ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc systemd-sysv- +fi # }}} # we definitely don't want to fail running fai dirinstall just