pf-tools commit: r752 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog sbin/mk_pxelinuxcfg templates/ubuntu-installer

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

Author: ccaillet-guest
Date: Tue Jun  8 08:47:27 2010
New Revision: 752

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=752
Log:
use %RUN_INITRD% var for defining initrd directive on PXE file for Ubuntu

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/sbin/mk_pxelinuxcfg
    branches/0.33-stable/templates/ubuntu-installer

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=752&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Jun  8 08:47:27 2010
@@ -10,6 +10,7 @@
   * sbin/mk_pxelinuxcfg :
     - use specific templates for ubuntu distros
     - improve function for handling ubuntu kernel standard name
+    - use %RUN_INITRD% var for defining initrd directive on PXE file for Ubuntu
   * sbin/mk_grub2opt : small fix on cmdline substitution
   * sbin/mk_sourceslist : use specific templates for ubuntu distros
   * adding ubuntu specific templates for PXE, preseed and sources.list files
@@ -29,7 +30,7 @@
     cmdline defined into host definition
   * debian/control : fixing deps for libmd5-perl which is included in perl >= 5.10
 
- -- Christophe Caillet <tof at sitadelle.com>  Tue, 08 Jun 2010 09:55:14 +0200
+ -- Christophe Caillet <tof at sitadelle.com>  Tue, 08 Jun 2010 10:47:13 +0200
 
 pf-tools (0.33.19-1) unstable; urgency=low
 

Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=752&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Tue Jun  8 08:47:27 2010
@@ -203,6 +203,10 @@
 									# Building preseed file
 									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/gs ;
 									$temptemplatecontent =~ s/%DISTRIB%/$M->{'distrib'}/gs ;
+									if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
+										$kernel_filename =~ /^vmlinuz-(.+)$/
+										$temptemplatecontent =~ s/%RUN_INITRD%/initrd=initrd.img-$1/gs ;
+									}
 									my $preseed_file;
 									if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
 										$preseed_file = Build_preseed_filename ( $m, $TPL_UBUNTU_PRESEED, $M ) ;

Modified: branches/0.33-stable/templates/ubuntu-installer
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/templates/ubuntu-installer?rev=752&op=diff
==============================================================================
--- branches/0.33-stable/templates/ubuntu-installer (original)
+++ branches/0.33-stable/templates/ubuntu-installer Tue Jun  8 08:47:27 2010
@@ -9,7 +9,7 @@
 
 LABEL linux
 	kernel %KERNEL%
-	append vga=normal root=/dev/sda2 -- %CONSOLE% %CMDLINE%
+	append vga=normal root=/dev/sda2 %RUN_INITRD% -- %CONSOLE% %CMDLINE%
 
 PROMPT 1
 TIMEOUT 100