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

[Thomas Lange]

Author: lange
Date: 2009-04-09 15:02:43 +0000 (Thu, 09 Apr 2009)
New Revision: 5315

Modified:
   trunk/bin/fai-cd
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
fai-cd, make-fai-nfsroot: awk can also do the grep

Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2009-04-09 14:51:32 UTC (rev 5314)
+++ trunk/bin/fai-cd	2009-04-09 15:02:43 UTC (rev 5315)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 3.3.7, 16-feb-2009"
+version="fai-cd 3.3.8, 9-apr-2009"
 
 forceremoval=0;
 burn=0
@@ -290,7 +290,7 @@
 nfsrootdir=$tmp/live/filesystem.dir
 kernelversion=$(ls -tr $NFSROOT/boot/vmlinu?-* | tail -1 | sed -e 's#.*/vmlinuz-##')
 
-faiversion=$(dpkg --root=$NFSROOT -l fai-client|grep fai-client|awk '{print $3}')
+faiversion=$(dpkg --root=$NFSROOT -l fai-client|awk '/fai-client/ {print $3}')
 isoversion="FAI $faiversion -- build $(date '+%c')"
 vname="Fully Automatic Installation CD"
 aname="Fully Automatic Installation by Thomas Lange, $isoversion"

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-04-09 14:51:32 UTC (rev 5314)
+++ trunk/bin/make-fai-nfsroot	2009-04-09 15:02:43 UTC (rev 5315)
@@ -275,7 +275,7 @@
 
     call_with_stamp create_base
     # save the list of all packages in the base.tgz
-    $ROOTCMD dpkg --get-selections | egrep 'install$' | awk '{print $1}' > var/tmp/base-pkgs.lis
+    $ROOTCMD dpkg --get-selections | awk '/install$/ {print $1}' > var/tmp/base-pkgs.lis
 
     if [ "$FAI_DEBMIRROR" ]; then
 	[ "$verbose" ] && echo "Mounting $FAI_DEBMIRROR to $NFSROOT/$MNTPOINT."

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 14:51:32 UTC (rev 5314)
+++ trunk/debian/changelog	2009-04-09 15:02:43 UTC (rev 5315)
@@ -18,6 +18,7 @@
   * lib/get-config-dir-svn: Added support for password in SVN URL  (thanks
     Robin Powell) (closes: #515057)
   * 20-removable_media: add fd0 entry to fstab only if device is present
+  * fai-cd, make-fai-nfsroot: awk can also do the grep
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -74,7 +75,7 @@
   * bin/faimond: Try to load Proc::Daemon only in case -d is given; if it
     fails, print a helpful error message (closes: #513090)
 
- -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 15:55:18 +0200
+ -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 17:02:27 +0200
 
  (3.2.17) unstable; urgency=medium