[Fai-commit] r5096 - in trunk: bin debian

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-05 17:59:26 +0000 (Fri, 05 Sep 2008)
New Revision: 5096

Modified:
   trunk/bin/fai-cd
   trunk/debian/changelog
Log:
fai-cd: do not redirect stdout to /dev/null when calling find_fai_data

Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2008-09-05 17:39:13 UTC (rev 5095)
+++ trunk/bin/fai-cd	2008-09-05 17:59:26 UTC (rev 5096)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 3.3.5, 10-aug-2008"
+version="fai-cd 3.3.6, 10-sep-2008"
 
 forceremoval=0;
 burn=0
@@ -146,7 +146,7 @@
 	echo $isoversion > $usbdir/.FAI-CD-VERSION
 
 	# now make the USB device bootable
-	rootpartition=$(find_fai_data 2>/dev/null | grep -A 1 'find /.FAI-CD-VERSION' | grep -v 'find /.FAI-CD-VERSION')
+	rootpartition=$(find_fai_data | grep -A 1 'find /.FAI-CD-VERSION' | grep -v 'find /.FAI-CD-VERSION')
 	usbdev=$(echo $rootpartition | sed -e 's/,[[:digit:]]//')
 	echo "Root partition is $rootpartition, device is: $usbdev"
 	if [ -n "$rootpartition" -a -n "$usbdev" ]; then

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-05 17:39:13 UTC (rev 5095)
+++ trunk/debian/changelog	2008-09-05 17:59:26 UTC (rev 5096)
@@ -1,6 +1,5 @@
 fai (3.2.10~beta4) unstable; urgency=low
 
-  [ Thomas Lange ]
   * control: add build-depends-indep (closes: #497683),
     add cfengine2 as recommends to fai-client (closes: #442843),
     remove mknbi, which is not used
@@ -29,8 +28,9 @@
   * 10-misc: remove tune2fs call, now done by new partition tool
   * use lenny in FAISERVER class
   * setup-storage.8: document usage of USE_SETUP_STORAGE; some typo fixes
+  * fai-cd: do not redirect stdout to /dev/null when calling find_fai_data
     
- -- Thomas Lange <lange at debian.org>  Fri, 05 Sep 2008 19:37:24 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 05 Sep 2008 19:59:04 +0200
 
 fai (3.2.9) unstable; urgency=low