pf-tools commit: r604 [ccaillet-guest] - in /trunk: debian/changelog sbin/mk_pxelinuxcfg

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

Author: ccaillet-guest
Date: Fri Jul 11 08:16:18 2008
New Revision: 604

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=604
Log:
fix on kernel debian package name in mk_pxelinuxcfg 

Modified:
    trunk/debian/changelog
    trunk/sbin/mk_pxelinuxcfg

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=604&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Jul 11 08:16:18 2008
@@ -3,8 +3,9 @@
   * preparing release
   * modifying Makefile for templates which are now installed on
     /usr/share/pf-tools/templates 
-
- -- Christophe Caillet <quadchris at free.fr>  Thu, 10 Jul 2008 14:00:56 +0200
+  * fix on kernel debian package name in mk_pxelinuxcfg 
+
+ -- Christophe Caillet <tof at sitadelle.com>  Fri, 11 Jul 2008 10:15:36 +0200
 
 pf-tools (0.33-0WIP2) unstable; urgency=low
 

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=604&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Fri Jul 11 08:16:18 2008
@@ -49,11 +49,11 @@
 	
 	if ( $pxefilename =~ /pxe/ ) {
 		my ( $vm, $type, $pxe, $version, @append ) = split ( /-/, $pxefilename ) ;
-		return "linux-image-".$version."-".$type."-".join ( "-", @append ) ;
+		return "linux-image-".$version."-".$type."-".join ( "-", @append )."-grsec" ;
 	}
 	else {
 		my ( $vm, $version, $type, $append_version ) = split ( /-/, $pxefilename ) ;
-		return "linux-image-".$version."-".$type."-".$append_version ;
+		return "linux-image-".$version."-".$type."-".$append_version."-grsec" ;
 	}
 }
 
@@ -184,9 +184,9 @@
 									}
 									$temptemplatecontent =~ s/%PRESEED_MD5%/$preseed_md5/gs;
 								} else {
-									my $ramdisk_size = Get_Ramdisk_size_from_Initrd($M->{'initrd'} );
-									$temptemplatecontent =~ s/%RAMDISK_SIZE%/$ramdisk_size/gs;
-									$temptemplatecontent =~ s/%INITRD%/$M->{'initrd'}/gs;
+# 									my $ramdisk_size = Get_Ramdisk_size_from_Initrd($M->{'initrd'} );
+# 									$temptemplatecontent =~ s/%RAMDISK_SIZE%/$ramdisk_size/gs;
+# 									$temptemplatecontent =~ s/%INITRD%/$M->{'initrd'}/gs;
 								}
 
 								my $arch = $M->{'arch'} || 'i386' ;