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

[Thomas Lange]

Author: lange
Date: 2009-04-09 12:50:49 +0000 (Thu, 09 Apr 2009)
New Revision: 5306

Modified:
   trunk/debian/changelog
   trunk/lib/subroutines-linux
Log:
lib/subroutines-linux: don't rely on ' as a field separator when
parsing boot.log, use = and strip off any quotes (closes: #439250)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 12:32:11 UTC (rev 5305)
+++ trunk/debian/changelog	2009-04-09 12:50:49 UTC (rev 5306)
@@ -8,6 +8,8 @@
   * make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
     -k now also upgrades all packages inside the nfsroot
   * fai-do-scripts: skip files with certain suffixes (closes: #500579)
+  * lib/subroutines-linux: don't rely on ' as a field separator when
+    parsing boot.log, use = and strip off any quotes (closes: #439250)
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -58,7 +60,7 @@
     initialization of encrypted partitions configurable
   * setup-storage.8: Document new encryption possibilities
 
- -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:31:39 +0200
+ -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:50:37 +0200
 
  (3.2.17) unstable; urgency=medium
 

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-04-09 12:32:11 UTC (rev 5305)
+++ trunk/lib/subroutines-linux	2009-04-09 12:50:49 UTC (rev 5306)
@@ -288,7 +288,7 @@
     local frsh
     local doexit=0
     local hostname=$(hostname)
-    local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d\' -f2)
+    local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d'=' -f2 | sed "s/'//g")
     local remotesh
 
     case "$FAI_LOGPROTO" in