pf-tools commit: r714 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog sbin/mk_grubopt

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Wed Jul 22 11:38:04 2009
New Revision: 714

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=714
Log:
Protect non-alphanumeric chars into regexp for detecting cmdline into grub file

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/sbin/mk_grubopt

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=714&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Jul 22 11:38:04 2009
@@ -1,4 +1,4 @@
-pf-tools (0.33.18-0.WIP) unstable; urgency=low
+pf-tools (0.33.18-1) unstable; urgency=low
 
   [ Thomas Parmelan ]
   * WORK IN PROGRESS...
@@ -30,8 +30,9 @@
     - avoid potential undefined value with %POPNAME% and %HOSTNODEINDEX%
   * Permit an interface definition for a particular host even if interface.<iface>
     (default value) is not defined. A warning is raised not an abort
-
- -- Christophe Caillet <tof at sitadelle.com>  Wed, 01 Jul 2009 11:33:55 +0200
+  * Protect non-alphanumeric chars into regexp for detecting cmdline into grub file
+
+ -- Christophe Caillet <tof at sitadelle.com>  Wed, 22 Jul 2009 13:36:14 +0200
 
 pf-tools (0.33.17-1) unstable; urgency=low
 

Modified: branches/0.33-stable/sbin/mk_grubopt
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_grubopt?rev=714&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_grubopt (original)
+++ branches/0.33-stable/sbin/mk_grubopt Wed Jul 22 11:38:04 2009
@@ -71,7 +71,7 @@
 	foreach ( @tmp_grub ) {
 		chomp ;
 		next if ( ! /^\# kopt=.*$/ ) ;
-		s/$/ $cmd_line/ if ( defined $cmd_line && ! /$cmd_line$/ ) ;
+		s/$/ $cmd_line/ if ( defined $cmd_line && ! /\Q$cmd_line\E$/ ) ;
 	}
 	
 	if ( $dst eq '-' ) {