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

[Thomas Lange]

Author: lange
Date: 2010-03-25 13:05:48 +0000 (Thu, 25 Mar 2010)
New Revision: 5747

Modified:
   trunk/bin/fai-chboot
   trunk/debian/changelog
Log:
fai-chboot: do not print templates containing a number as subnet

Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2010-03-22 20:24:47 UTC (rev 5746)
+++ trunk/bin/fai-chboot	2010-03-25 13:05:48 UTC (rev 5747)
@@ -6,7 +6,7 @@
 # fai-chboot -- manage configuration for network boot
 #
 # This script is part of FAI (Fully Automatic Installation)
-# Copyright (C) 2003-2009 Thomas Lange, lange at informatik.uni-koeln.de
+# Copyright (C) 2003-2010 Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 3.5 21-october-2009";
+$version="version 3.5.1 25-march-2010";
 
 use Socket;
 use Net::hostent;
@@ -134,7 +134,7 @@
       $type = '[Template]';
     }
 
-    if ($hex =~ /[0-9A-F]+/) {
+    if ($hex =~ /^[0-9A-F]+/) {
       my $hexstrip = (split /\./,$hex)[0]; # remove .disable if necessary
       $n = $hexstrip;
       # hex to ip/subnet address

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-03-22 20:24:47 UTC (rev 5746)
+++ trunk/debian/changelog	2010-03-25 13:05:48 UTC (rev 5747)
@@ -1,3 +1,9 @@
+fai (3.3.5~beta1) unstable; urgency=low
+
+  * fai-chboot: do not print templates containing a number as subnet
+
+ -- Thomas Lange <lange at debian.org>  Thu, 25 Mar 2010 14:05:05 +0100
+
 fai (3.3.4) unstable; urgency=low
 
   [ Thomas Lange ]