pf-tools commit: r756 [ccaillet-guest] - /branches/0.33-stable/sbin/mk_pxelinuxcfg

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

Author: ccaillet-guest
Date: Tue Jun  8 09:30:01 2010
New Revision: 756

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=756
Log:
FIX: handling arch correctly when defining the initrd file for Ubuntu

Modified:
    branches/0.33-stable/sbin/mk_pxelinuxcfg

Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=756&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Tue Jun  8 09:30:01 2010
@@ -206,7 +206,12 @@
 									if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
 										$kernel_filename =~ /vmlinuz-(.+)$/ ;
 										my $version = $1;
-										$temptemplatecontent =~ s/%RUN_INITRD%/initrd=initrd.img-$version/gs ;
+										if ( $M->{'arch'} eq 'amd64' ) {
+											$temptemplatecontent =~ s/%RUN_INITRD%/initrd=amd64\/initrd.img-$version/gs ;
+										}
+										else {
+											$temptemplatecontent =~ s/%RUN_INITRD%/initrd=initrd.img-$version/gs ;
+										}
 									}
 									my $preseed_file;
 									if ( $M->{'deploymode'} =~ /^ubuntu/ ) {