pf-tools commit: r439 [parmelan-guest] - in /trunk: README.doc debian/changelog lib-net

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

Author: parmelan-guest
Date: Tue Feb 27 17:00:40 2007
New Revision: 439

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=439
Log:
better cmdline

Modified:
    trunk/README.doc
    trunk/debian/changelog
    trunk/lib-net

Modified: trunk/README.doc
URL: http://svn.debian.org/wsvn/pf-tools/trunk/README.doc?rev=439&op=diff
==============================================================================
--- trunk/README.doc (original)
+++ trunk/README.doc Tue Feb 27 17:00:40 2007
@@ -11,8 +11,8 @@
 
   [optional]
 
-  If defined, the value of this directive is added to the PXE configuration
-  file (and to the user-mode-linux command line).
+  If defined, the value of this directive is substituted to %CMDLINE% in the
+  PXE configuration file, and added to the user-mode-linux command line.
 
   Sample use :
 

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=439&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Feb 27 17:00:40 2007
@@ -4,7 +4,7 @@
     more information).
   * Use dh_installdocs to install the README* files.
 
- -- Thomas Parmelan <tom at sitadelle.com>  Tue, 27 Feb 2007 16:16:56 +0100
+ -- Thomas Parmelan <tom at sitadelle.com>  Tue, 27 Feb 2007 16:53:54 +0100
 
 pf-tools (0.32.45-1) unstable; urgency=low
 

Modified: trunk/lib-net
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib-net?rev=439&op=diff
==============================================================================
--- trunk/lib-net (original)
+++ trunk/lib-net Tue Feb 27 17:00:40 2007
@@ -1589,10 +1589,9 @@
 			    my $ramdisk_size = Get_Ramdisk_size_from_Initrd($M->{initrd});
 			    $temptemplatecontent =~
 			      s/%RAMDISK_SIZE%/$ramdisk_size/gs;
-			    my $cmdline = $M->{cmdline};
-			    if ($cmdline) {
-				$temptemplatecontent .= ' ' . $cmdline;
-			    }
+			    my $cmdline = $M->{cmdline} || '';
+			    $temptemplatecontent =~
+			      s/%CMDLINE%/$cmdline/gs;
                             print PXELINUXCFG $temptemplatecontent;
                             close(PXELINUXCFG);
                         }