X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=620c101aefde8f50a467e17087b6484508fa9d5e;hp=5dc3433589c5b4a409003eb4f190490e5b6e7998;hb=8075b3f8fc4ef5aa545ba27b3066f302aeb1ecea;hpb=7bbfd24bb59bead0491ff8cb5ab7fa8fe6dee619 diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 5dc3433..620c101 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -1,5 +1,5 @@ #!/bin/bash -# Filename: /etc/grml/fai/config/hooks/instsoft.GRMLBASE +# Filename: ${GRML_FAI_CONFIG}/hooks/instsoft.GRMLBASE # Purpose: Grml specific software installation in the chroot, executed after updatebase # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ @@ -9,16 +9,21 @@ set -u set -e +# if hooks/updatebase.GRMLBASE fails for whatever reason +# and can't skip instsoft.GRMLBASE we have to make sure +# we exit here as well +if [ -n "$BUILD_ONLY" ] ; then + "Exiting hooks/instsoft.GRMLBASE as BUILD_ONLY environment is set." + exit 0 +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 - if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then - cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf - else - cat /etc/resolv.conf >> $target/etc/resolv.conf - fi - 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 @@ -35,53 +40,52 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2"; EOF - # FAI softupdate executes upgrade only with the sources.list being - # present in the chroot - so let's do it on our own: - if [ -r /etc/grml/fai/apt/sources.list ] ; then - if [ -L $target/etc/apt/sources.list ] ; then - rm $target/etc/apt/sources.list - fi - - # install grml-live's (on the fly adjusted) sources.list config - cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list - - # when re-running grml-live with the -u option we do not want to use the - # sources.list config of the live system but grml-live's config instead, - # therefore temporarly move known files and restore them again later on - # through /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup: - if [ -r $target/etc/apt/sources.list.d/grml.list ] ; then - mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused - fi - if [ -r $target/etc/apt/sources.list.d/debian.list ] ; then - mv $target/etc/apt/sources.list.d/debian.list $target/etc/apt/sources.list.d/debian.unused - fi + # 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 - # run it on our own, as updatebase is used at the wrong stage for our needs, - # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE - # 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 - # but should warn the user - if ! $ROOTCMD apt-get update ; then - echo "Warning: there was an error executing apt-get update, continuing anyway." + # 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 - # 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 - if ! [ -x $target/usr/bin/aptitude ] ; then + if ! $ROOTCMD test -x /usr/bin/aptitude ; then $ROOTCMD apt-get -y install aptitude fi - if [ -x $target/usr/bin/aptitude ] ; then + # 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- + + # make sure we can upgrade automatically, + # even with unsigned repos, but only if user wants it + if [ "${FAI_ALLOW_UNSIGNED:-}" = "1" ] ; then + APTGET_OPTS="${APTGET_OPTS:-} --allow-unauthenticated" + 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 safe-upgrade + APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS safe-upgrade else - APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y upgrade + APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS upgrade fi else - APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y upgrade + APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y $APTGET_OPTS --force-yes upgrade fi exit # make sure we don't continue behind the following "fi" @@ -90,6 +94,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 @@ -101,14 +120,9 @@ 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 +$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc systemd-sysv- # }}} -# 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 @@ -132,4 +146,4 @@ if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then fi ## END OF FILE ################################################################# -# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 +# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2