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

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

Author: ccaillet-guest
Date: Tue Nov 18 11:36:51 2008
New Revision: 677

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=677
Log:
* Bugfix release
* Backporting r676 from trunk for avoiding a potential error

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=677&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Nov 18 11:36:51 2008
@@ -1,3 +1,10 @@
+pf-tools (0.33.14-1) unstable; urgency=low
+
+  * Bugfix release
+  * Backporting r676 from trunk for avoiding a potential error
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 18 Nov 2008 12:35:21 +0100
+
 pf-tools (0.33.13-1) unstable; urgency=low
 
   * Minor features enhancement release

Modified: branches/0.33-stable/sbin/mk_grubopt
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_grubopt?rev=677&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_grubopt (original)
+++ branches/0.33-stable/sbin/mk_grubopt Tue Nov 18 11:36:51 2008
@@ -40,6 +40,7 @@
 my $MENU_GRUB	= "/boot/grub/menu.lst" ;
 my $HOSTNAME	= hostname ;
 my $DEST	= "-" ;
+my $NET		= "GLOBAL:private-network" ;
 my $HELP	= 0 ;
 my $DEBUG	= 0 ;
 my $VERBOSE	= 0 ;
@@ -54,6 +55,7 @@
 	-s --src	source for GRUB configuration (default: /boot/grub/menu.lst)
 	-d --dst	destination for modified GRUB configuration (default: /boot/grub/menu.lst)
 	--host		hostname on which GRUB configuration applied
+	-n --net	Possiblitiy for defining an alternate PATH for private-network file (default GLOBAL:private-network)
 # ENDHELP
 }
 
@@ -69,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" ) ) {
@@ -107,6 +110,7 @@
     'src|s=s'	=> \$MENU_GRUB,
     'dst|d=s'	=> \$DEST,
     'host=s'	=> \$HOSTNAME,
+    'net|n=s'	=> \$NET,
     'debug'	=> \$DEBUG,
     'help|h'	=> \$HELP,
     'verbose|v'	=> \$VERBOSE
@@ -126,7 +130,7 @@
 $DEST = "-" if ( $DEBUG ) ;
 $VERBOSE = 1 if ( $DEBUG ) ;
 
-my $NETWORK = Init_lib_net ( Get_source ( "GLOBAL:private-network" ) ) ;
+my $NETWORK = Init_lib_net ( Get_source ( $NET ) ) ;
 if ( ! Change_kopt ( Get_Cmdline ( $NETWORK, $HOSTNAME ), $MENU_GRUB, $DEST ) ) {
 	die "Unable to change kernel options(s) into file ".$MENU_GRUB."\n" ;
 }