[Fai-commit] r5491 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2009-08-03 12:13:29 +0000 (Mon, 03 Aug 2009)
New Revision: 5491

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines-linux
Log:
  task_updatebase now writes to software.log

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-08-03 12:12:35 UTC (rev 5490)
+++ trunk/debian/changelog	2009-08-03 12:13:29 UTC (rev 5491)
@@ -5,6 +5,7 @@
     remove yes pipe when calling debootstrap
     if NEXTTEST is used, define a class for next reboot. Thanks to
     Sebastian Hetze for this patch.
+    task_updatebase now writes to software.log
   * subroutines: do not unset the functions task_$taskname after use
     fill task_tests with code, execute tests before task chboot
     create /var/run/sshd (needed for ubuntu 9.10)
@@ -93,7 +94,7 @@
     debugging this).  (closes: #532321)
   * Bumped setup-storage version number to 1.1.
   
- -- Thomas Lange <lange at debian.org>  Fri, 24 Jul 2009 10:49:59 +0200
+ -- Thomas Lange <lange at debian.org>  Mon, 03 Aug 2009 14:13:16 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-08-03 12:12:35 UTC (rev 5490)
+++ trunk/lib/subroutines-linux	2009-08-03 12:13:29 UTC (rev 5491)
@@ -252,8 +252,15 @@
 task_updatebase() {
 
     # maybe the base system is not up to date
-    echo "Updating base"
-    updatebase
+
+    if [ "$verbose" ]; then
+	echo "Updating base"
+	updatebase </dev/null 2>&1 | tee -a $LOGDIR/software.log
+        task_error 474 ${PIPESTATUS[0]}
+    else
+        updatebase </dev/null >> $LOGDIR/software.log 2>&1
+        task_error 474 $?
+    fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_instsoft() {