[Fai-commit] r4727 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-12 17:54:28 +0000 (Mon, 12 Nov 2007)
New Revision: 4727

Modified:
   trunk/bin/make-fai-nfsroot
Log:
log output to /var/log/fai/make-fai-nfsroot.log


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-11-12 17:54:07 UTC (rev 4726)
+++ trunk/bin/make-fai-nfsroot	2007-11-12 17:54:28 UTC (rev 4727)
@@ -50,10 +50,12 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 check_nfsroot() {
 
+    set +e
     # simple test, to see if important thing are available inside the nfsroot
     [ -d $NFSROOT/usr/share/live-initramfs ] || die "live-initramfs is not installed."
     local files=$(ls $NFSROOT/boot/initrd* 2>/dev/null)
     [ -z "$files" ] && die "No initrd installed."
+    return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 badupdateto32() {
@@ -103,6 +105,8 @@
     exit 9
 fi
 
+{ # start of block which output will be written to log file
+
 set -e
 
 # use FAI_ETC_DIR from environment variable
@@ -524,3 +528,5 @@
 trap "true" EXIT
 echo "make-fai-nfsroot finished $merror."
 exit 0
+} | tee /var/log/fai/make-fai-nfsroot.log
+echo "Log file written to /var/log/fai/make-fai-nfsroot.log"