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

[lange at alioth.debian.org]

Author: lange
Date: 2008-10-14 13:11:02 +0000 (Tue, 14 Oct 2008)
New Revision: 5187

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
use awk instead of cut and grep (closes: #500046)

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2008-10-14 12:56:27 UTC (rev 5186)
+++ trunk/bin/make-fai-nfsroot	2008-10-14 13:11:02 UTC (rev 5187)
@@ -240,8 +240,7 @@
     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
         die "NFSROOT directory $NFSROOT is mounted using nosuid or nodev. Aborting"
     fi
-
-    local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
+    local dversion=$(dpkg -l debootstrap | awk '/debootstrap/ {print $3}')
     echo "Creating base system using debootstrap version $dversion"
     echo "Calling debootstrap $1 $NFSROOT $2"
     yes '' | LC_ALL=C call_verbose debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-10-14 12:56:27 UTC (rev 5186)
+++ trunk/debian/changelog	2008-10-14 13:11:02 UTC (rev 5187)
@@ -1,3 +1,9 @@
+fai (3.2.12) unstable; urgency=low
+
+  * make-fai-nfsroot: print version of debootstrap (closes: #500046)
+
+ -- Thomas Lange <lange at debian.org>  Tue, 14 Oct 2008 15:04:22 +0200
+
 fai (3.2.11) unstable; urgency=low
 
   * control: depend on syslinux-common instead of syslinux (closes: #494417)