pf-tools commit: r754 [ccaillet-guest] - in /branches/0.33-stable/sbin: mk_pxelinuxcfg mk_sourceslist

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

Author: ccaillet-guest
Date: Tue Jun  8 09:03:20 2010
New Revision: 754

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=754
Log:
Small fix

Modified:
    branches/0.33-stable/sbin/mk_pxelinuxcfg
    branches/0.33-stable/sbin/mk_sourceslist

Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=754&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Tue Jun  8 09:03:20 2010
@@ -49,7 +49,7 @@
 	my ( $pxefilename, $deploymode ) = @_ ;
 	
 	if ( $deploymode =~ /^ubuntu/ ) {
-		$pxefilename =~ /^vmlinuz-([.]+)$/;
+		$pxefilename =~ /vmlinuz-(.+)$/;
 		return "linux-image-".$1;
 	}
 	else {
@@ -204,7 +204,7 @@
 									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/gs ;
 									$temptemplatecontent =~ s/%DISTRIB%/$M->{'distrib'}/gs ;
 									if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
-										$kernel_filename =~ /^vmlinuz-(.+)$/ ;
+										$kernel_filename =~ /vmlinuz-(.+)$/ ;
 										$temptemplatecontent =~ s/%RUN_INITRD%/initrd=initrd.img-$1/gs ;
 									}
 									my $preseed_file;

Modified: branches/0.33-stable/sbin/mk_sourceslist
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_sourceslist?rev=754&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_sourceslist (original)
+++ branches/0.33-stable/sbin/mk_sourceslist Tue Jun  8 09:03:20 2010
@@ -174,5 +174,8 @@
 if ( $SRV->{'deploymode'} =~ /^ubuntu/ && $TPL eq "" ) {
 	$TPL = $TPL_DIR."ubuntu-sources.list.tpl";
 }
+elsif ( $TPL eq "" ) {
+	$TPL = $TPL_DIR.$DEFAULT_TPL;
+}
 
 Mk_sourceslist ( $SRV, $DST, $TPL, $SECTIONS ) ;