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=51a0e7736a4722891efb945fdd545c60c8ab68e7;hb=d039e207a6fea49a966168e7d31487b86840af11;hpb=db5741b5b41210da401504a3493d9a284da32e9c diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 51a0e77..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 @@ -20,33 +25,10 @@ fi if [ "$FAI_ACTION" = "softupdate" ] ; then echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running" - if [ -r /etc/resolv.conf ] ; then - case "$(chroot $target readlink -f /etc/resolv.conf)" in - /run/*) # resolvconf with /run - mkdir -p $target/run/resolvconf - cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf - ;; - /lib/*) # resolvconf without /run - # sanity check to avoid "input file is output file", - # see http://bts.grml.org/grml/issue984 - if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then - cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf - else - echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2 - echo " Looks like something is wrong, please fix manually." >&2 - exit 1 - fi - ;; - *) # no resolvconf - if ! [ -L $target/etc/resolv.conf ] ; then - cat /etc/resolv.conf >> $target/etc/resolv.conf - else - echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2 - exit 1 - fi - ;; - esac - fi + # /etc/resolv.conf is usually a symlink, pointing out of the chroot. + # Make it a file with known contents. + rm -f "${target}"/etc/resolv.conf + cat /etc/resolv.conf >> "$target"/etc/resolv.conf if [ -r $target/etc/policy-rc.d.conf ] ; then sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf @@ -71,9 +53,23 @@ EOF $ROOTCMD ln -s /bin/true /usr/sbin/update-grub 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 + # work around a bug which causes openvz to freeze when grub-probe is invoked + if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then + echo "Diverting grub-probe executable" + $ROOTCMD dpkg-divert --rename --add /usr/sbin/grub-probe + $ROOTCMD ln -s /bin/true /usr/sbin/grub-probe + fi + + # Update package lists (so they exist at all), so we actually can + # 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 @@ -86,6 +82,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 @@ -102,6 +102,21 @@ fi # no softupdate but fresh installation echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running" +# work around /etc/kernel/postinst.d/zz-update-grub failing +# inside openvz environment, see #597084 +if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then + echo "Diverting update-grub executable" + $ROOTCMD dpkg-divert --rename --add /usr/sbin/update-grub + $ROOTCMD ln -s /bin/true /usr/sbin/update-grub +fi + +# work around a bug which causes openvz to freeze when grub-probe is invoked +if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then + echo "Diverting grub-probe executable" + $ROOTCMD dpkg-divert --rename --add /usr/sbin/grub-probe + $ROOTCMD ln -s /bin/true /usr/sbin/grub-probe +fi + # make sure we have file-rc available before package_config/GRML* is being executed {{{ # the apt-get update might return an error if there's for example # a hashsum mismatch on Debian mirror sources, we might want to continue @@ -111,15 +126,13 @@ 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 -# }}} - -# get rid of insserv: -if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then - $ROOTCMD apt-get -y --purge remove insserv +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 # because of some well known bugs: