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

[grml-live.git] / patches / fai_dirupdate_1.diff

diff --git a/patches/fai_dirupdate_1.diff b/patches/fai_dirupdate_1.diff
deleted file mode 100644 (file)
index fb6ca3b..0000000
--- a/patches/fai_dirupdate_1.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- /usr/lib/fai/subroutines.orig      2007-09-21 10:04:05.000000000 +0200
-+++ /usr/lib/fai/subroutines   2007-09-21 10:34:40.000000000 +0200
-@@ -266,6 +266,9 @@
-       dirinstall)
-           task dirinstall
-           ;;
-+      dirupdate)
-+          task dirupdate
-+          ;;
-       softupdate)
-           echo Performing FAI system update. All data may be overwritten!
-           task softupdate
-@@ -491,6 +494,29 @@
-     fi
- }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-+task_dirupdate() {
-+
-+    > $stamp
-+
-+    mkdir -p $FAI_ROOT
-+    FAI_ROOT=$(cd $FAI_ROOT;pwd)
-+    echo "Updating directory $FAI_ROOT"
-+    task configure
-+    task updatechroot
-+    task finish
-+
-+    rm -f $stamp
-+    unset LOGUSER # so logfile are not saved to remote
-+    task savelog
-+
-+    if [ -f $stamp ]; then
-+      echo "Error while executing commands in subshell."
-+      echo "$stamp was not removed."
-+      sendmon "TASKERROR install 21"
-+      die "Please look at the log files in $LOGDIR for errors."
-+    fi
-+}
-+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- task_softupdate() {
- 
-     local stamp=/var/run/fai/fai_softupdate_is_running