From f1f52ba9ab0ba374405ab6a4ec7c586202f208e6 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Sun, 16 Dec 2007 19:37:46 +0100
Subject: [PATCH] Install aptitude in softupdate if not present

---
 debian/changelog                                        | 1 +
 etc/grml/fai/config/hooks/instsoft.GRMLBASE             | 4 ++++
 etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bdfae65..3e8291d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ grml-live (0.0.13) unstable; urgency=low
     /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
   * Disable Recommends for aptitude as well.
   * Check for presence of live-initramfs in 10-build-initramfs.
+  * Install aptitude in softupdate if not present.
   * Do some further cleanups via /etc/grml/fai/grml/grml_cleanup_chroot.deborphan
   * Remove hwtools from GRML_FULL, see #397723
   * Remove several packages from GRMLBASE and integrate them in GRML_MEDIUM
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index b5ac237..715888c 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -69,6 +69,10 @@ EOF
    # 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
+   if ! [ -x $target/usr/bin/aptitude ] ; then
+      $ROOTCMD apt-get -y install aptitude
+   fi
+
    if [ -x $target/usr/bin/aptitude ] ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
          $ROOTCMD aptitude -y safe-upgrade
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
index 62f15f5..98ea666 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
@@ -26,7 +26,7 @@ if [ -z "$KERNELVERSION" ] ; then
    exit 1
 fi
 
-if [ -f /usr/share/initramfs-tools/scripts/live ] ; then
+if [ -f $target/usr/share/initramfs-tools/scripts/live ] ; then
    $ROOTCMD update-initramfs -c -t -k $KERNELVERSION
 else
    echo "Error: live-initramfs does not seem to be present, can not create initramfs. Exiting.">&2
-- 
2.1.4