X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=8600154a62e8f614ddc569ef3eec53d414a3f89a;hp=a678e38560f5592bc14eda175ae78198ef944d92;hb=866b47c0652d8ce6d1bea20442f8ab273b5ba99a;hpb=088fef04f9106288d97830ea81375ec80f095286 diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index a678e38..8600154 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -1,6 +1,6 @@ -#!/bin/sh -# Filename: /etc/grml/fai/config/hooks/instsoft.GRML -# Purpose: grml specific Debian installation in the chroot +#!/bin/bash +# 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/ # License: This file is licensed under the GPL v2 or any later version. @@ -9,24 +9,43 @@ set -u set -e -# visualize chroot inside zsh: -echo grml_chroot > $target/etc/debian_chroot +GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list" +DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list" -HOSTNAME='' -[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf -[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local -[ -n "$HOSTNAME" ] || HOSTNAME=grml -echo "$HOSTNAME" > $target/etc/hostname +# 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 "Softupdate of FAI via grml-live running" + 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 + if [ -d $target/etc/resolvconf/run ] ; then # 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 + 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 + elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run + # /etc/resolvconf/run symlinks to /run/resolvconf + mkdir -p $target/run/resolvconf + cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf + else # no resolvconf installed in chroot + if ! [ -L $target/etc/resolv.conf ] ; then cat /etc/resolv.conf >> $target/etc/resolv.conf - fi + else + echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2 + exit 1 + fi + fi fi if [ -r $target/etc/policy-rc.d.conf ] ; then @@ -44,25 +63,43 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2"; EOF - # make sure we can handle kernel upgrades: - if [ -r $target/etc/kernel-img.conf ] ; then - if ! grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then - echo "silent_modules = Yes" >> $target/etc/kernel-img.conf - fi + # FAI softupdate executes upgrade only with the sources.list being + # present in the chroot - so let's do it on our own: + fcopy /etc/apt/sources.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 "$GRML_SOURCES_LIST" ] ; then + mv "$GRML_SOURCES_LIST" "${GRML_SOURCES_LIST}.unused" fi - # 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 - cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list + if [ -r "$DEBIAN_SOURCES_LIST" ] ; then + mv "$DEBIAN_SOURCES_LIST" "${DEBIAN_SOURCES_LIST}.unused" 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 - $ROOTCMD apt-get update + # see ${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." + 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 + + # 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 ! [ -x $target/usr/bin/aptitude ] ; then $ROOTCMD apt-get -y install aptitude fi @@ -77,55 +114,31 @@ EOF APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y upgrade fi -else # no softupdate but fresh installation - -# install all apt related files -if [ -r /etc/grml/fai/files/etc/apt ] ; then - cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/ - # remove grml-live's sources.list file from chroot: - if [ -r $target/etc/apt/important_note.txt ] ; then - grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt - fi + exit # make sure we don't continue behind the following "fi" fi -# install all present (but at least the grml) gpg keys: -if [ -r /etc/grml/fai/files/etc/apt/grml.key ] ; then - for file in /etc/grml/fai/files/etc/apt/*.key ; do - FILE="$(basename $file)" - # installed via 'cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/' above already - # cp $file $target/etc/apt/"$FILE" - $ROOTCMD apt-key add /etc/apt/"$FILE" - done -else - gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \ - gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787 - gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key - $ROOTCMD apt-key add /etc/apt/grml.key -fi +# no softupdate but fresh installation +echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running" -# make sure the file exists -[ -e $target/etc/apt/apt.conf ] || touch $target/etc/apt/apt.conf - -# work around http://trac.lighttpd.net/trac/ticket/657 -if ! grep -q 'Acquire::http::Pipeline-Depth.*0' $target/etc/apt/apt.conf ; then - echo "Acquire::http::Pipeline-Depth 0; // added by grml-live" >> $target/etc/apt/apt.conf +# 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 +# but should warn the user +if ! $ROOTCMD apt-get update ; then + echo "Warning: there was an error executing apt-get update, continuing anyway." + echo "Warning: there was an error executing apt-get update, continuing anyway." >&2 fi -# Recommends just pull in way tooooo much packages, so disable it: -if ! grep -q 'APT::Install-Recommends.*false' $target/etc/apt/apt.conf ; then - echo "APT::Install-Recommends false; // added by grml-live" >> $target/etc/apt/apt.conf -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 +# }}} -# Notice: deprecated with aptitude (0.4.11-1): -if ! grep -q 'Aptitude::Recommends-Important.*false' $target/etc/apt/apt.conf ; then - echo "Aptitude::Recommends-Important false; // added by grml-live" >> $target/etc/apt/apt.conf +# get rid of insserv: +if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then + $ROOTCMD apt-get -y --purge remove insserv fi -# make sure we have file-rc available before -# package_config/GRML is being executed: -$ROOTCMD apt-get update -$ROOTCMD aptitude -f -y install file-rc - # 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 @@ -148,7 +161,5 @@ if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then $ROOTCMD dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d fi -fi # end of FAI_ACTION = softupdate - ## 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