Support option -u for updating; added FAI patches; several other small updates

[grml-live.git] / patches / fai_support_aptitude_in_updatebase

diff --git a/patches/fai_support_aptitude_in_updatebase b/patches/fai_support_aptitude_in_updatebase
new file mode 100644 (file)
index 0000000..173c4cf
--- /dev/null
+++ b/patches/fai_support_aptitude_in_updatebase
@@ -0,0 +1,14 @@
+--- /usr/lib/fai/updatebase.orig       2007-10-29 00:12:49.000000000 +0100
++++ /usr/lib/fai/updatebase    2007-10-29 00:13:27.000000000 +0100
+@@ -31,7 +31,11 @@
+ [ $? -ne 0 ] && yes '' | $ROOTCMD dpkg --configure -a 
+ # using the above value, causes an error: "dpkg need action"
+ export aptopt=
++if [ -x /usr/bin/aptitude ] ; then
++$ROOTCMD aptitude $aptopt -f -y dist-upgrade </dev/null
++else
+ $ROOTCMD apt-get $aptopt -f -y dist-upgrade </dev/null
++fi
+ # update dpkg info which packages are available
+ tmp=$($ROOTCMD mktemp)
+ $ROOTCMD apt-cache dumpavail > $FAI_ROOT/$tmp