pf-tools commit: r680 [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:50:13 2008
New Revision: 680

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=680
Log:
Fixing mk_grubopt

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=680&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Nov 18 11:50:13 2008
@@ -3,7 +3,7 @@
   * 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
+ -- Christophe Caillet <tof at sitadelle.com>  Tue, 18 Nov 2008 12:49:25 +0100
 
 pf-tools (0.33.13-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=680&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_grubopt (original)
+++ branches/0.33-stable/sbin/mk_grubopt Tue Nov 18 11:50:13 2008
@@ -71,7 +71,7 @@
 	foreach ( @tmp_grub ) {
 		chomp ;
 		next if ( ! /^\# kopt=.*$/ ) ;
-		s/$/ $cmd_line/ if ( defined $cmd_line ) ;
+		s/$/ $cmd_line/ if ( defined $cmd_line && ! /$cmd_line$/ ) ;
 	}
 	
 	if ( $dst eq '-' ) {