X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=cf730400d93f99f805be042f8ed3a6efd2ca7b82;hb=91e9fb27abd062d995110c8e03bfd1e60c6813c4;hp=fcc2bdb00029135e5c8b3354fc688b3b75ec6c11;hpb=a242e27306035a23c96bf5b07b0840942ed245fb;p=grml-live-grml.git diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index fcc2bdb..cf73040 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -81,18 +81,18 @@ EOF # '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 + if ! $ROOTCMD test -x /usr/bin/aptitude ; then $ROOTCMD apt-get -y install aptitude fi - if [ -x $target/usr/bin/aptitude ] ; then + 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 else APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y 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 --force-yes upgrade fi exit # make sure we don't continue behind the following "fi"