X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=0d6cae5d9c3233e4dd9b46b79b147a1d17987a89;hp=65da202a8202c7efe89c89a99c70b4d089418f71;hb=465346b41da7ba02a7609de03a7e49d325295c1c;hpb=c92e94e88fb89eefe6806a278a5b4c43f5ab08d4 diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 65da202..0d6cae5 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -55,18 +55,18 @@ EOF $ROOTCMD ln -s /bin/true /usr/sbin/grub-probe 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 + # Update package lists (so they exist at all), so we actually can + # install software. + $ROOTCMD apt-get update + + # 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 if ! $ROOTCMD test -x /usr/bin/aptitude ; then $ROOTCMD apt-get -y install aptitude fi - # Update package lists (so they exist at all), so we actually can - # install software. - $ROOTCMD apt-get update - # make sure we can upgrade automatically, # even with unsigned repos, but only if user wants it if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then @@ -74,6 +74,10 @@ EOF APTITUDE_OPTS="${APTITUDE_OPTS:-} --allow-untrusted" fi + # make sure we don't fail when configuration files changed + APTGET_OPTS="${APTGET_OPTS:-} -o DPkg::Options::=--force-confdef -o DPkg::Options::=--force-confmiss -o DPkg::Options::=--force-confnew" + APTITUDE_OPTS="${APTITUDE_OPTS:-} -o DPkg::Options::=--force-confdef -o DPkg::Options::=--force-confmiss -o DPkg::Options::=--force-confnew" + if $ROOTCMD test -x /usr/bin/aptitude ; then if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS safe-upgrade @@ -119,11 +123,6 @@ fi $ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc # }}} -# get rid of insserv: -if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then - $ROOTCMD apt-get -y --purge remove insserv -fi - # we definitely don't want to fail running fai dirinstall just # because of some well known bugs: [ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d