pf-tools commit: r676 [ccaillet-guest] - in /trunk: debian/changelog sbin/mk_grubopt

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

Author: ccaillet-guest
Date: Tue Nov 18 11:35:03 2008
New Revision: 676

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=676
Log:
Avoid a potential error returned by mk_grubopt when cmdline not defined
into private-network for the specified hostname

Modified:
    trunk/debian/changelog
    trunk/sbin/mk_grubopt

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=676&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Nov 18 11:35:03 2008
@@ -19,8 +19,10 @@
   * Adding function for comparing routing table against CVS configuration
   * Adding mk_grubopt for inserting into GRUB configuration file the kernel
     options defined in cmdline into private-network definitions 
-
- -- Christophe Caillet <quadchris at free.fr>  Mon, 17 Nov 2008 17:37:58 +0100
+  * Avoid a potential error returned by mk_grubopt when cmdline not defined
+    into private-network for the specified hostname
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 18 Nov 2008 12:33:17 +0100
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/sbin/mk_grubopt
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_grubopt?rev=676&op=diff
==============================================================================
--- trunk/sbin/mk_grubopt (original)
+++ trunk/sbin/mk_grubopt Tue Nov 18 11:35:03 2008
@@ -71,13 +71,14 @@
 	foreach ( @tmp_grub ) {
 		chomp ;
 		next if ( ! /^\# kopt=.*$/ ) ;
-		s/$/ $cmd_line/ ;
+		s/$/ $cmd_line/ if ( defined $cmd_line ) ;
 	}
 	
 	if ( $dst eq '-' ) {
 		foreach ( @tmp_grub ) {
 			print $_."\n" ;
 		}
+		return 1 ;
 	}
 	else {
 		unless ( open ( TMPDST, ">/tmp/menulst" ) ) {