pf-tools commit: r615 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Net.pm sbin/mk_pxelinuxcfg templates/standard-installer templates/standard-preseed.tpl

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

Author: ccaillet-guest
Date: Wed Jul 30 13:27:49 2008
New Revision: 615

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=615
Log:
Introducing some changes for ubuntu-installer

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Net.pm
    trunk/sbin/mk_pxelinuxcfg
    trunk/templates/standard-installer
    trunk/templates/standard-preseed.tpl

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=615&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Jul 30 13:27:49 2008
@@ -7,8 +7,9 @@
     file from Get_Active_Filename
   * Fix : fix HOSTNAME regexp on Conf.pm and introducing POPNAME var
   * Adding link for filter_systemmap for backward compatibility 
-
- -- Christophe Caillet <tof at sitadelle.com>  Mon, 21 Jul 2008 16:26:57 +0200
+  * Introducing some changes for ubuntu-installer
+
+ -- Christophe Caillet <quadchris at free.fr>  Wed, 30 Jul 2008 15:26:52 +0200
 
 pf-tools (0.33-0+RC1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=615&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Wed Jul 30 13:27:49 2008
@@ -940,7 +940,7 @@
 		'deploymode',
 		'dns',
 		'arch',
-		'distrib'
+		'distrib',
 		'initrd',
 		'cmdline',
 		'console'

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=615&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Wed Jul 30 13:27:49 2008
@@ -41,7 +41,7 @@
 	chmod ( oct ( $mode ), $PRESEED_REPOS ) ;
 }
 
-my $TPL_PRESEED		= "/usr/share/pf-tools/templates/debian-preseed.tpl" ;
+my $TPL_PRESEED		= "/usr/share/pf-tools/templates/standard-preseed.tpl" ;
 my $DEFAULT_PRESEED	= $PRESEED_REPOS."/default_preseed.txt" ;
 
 sub Get_kpkg_from_pxefilename ($) {
@@ -73,8 +73,8 @@
 	my $dist_src	= $ref_srv->{'deploymode'} ;
 	$dist_src	=~ s/^(debian|ubuntu)-installer/$1/ ;
 	
-	$preseed_content =~ s/%DISTSRC%/$dist_src/ ;
-	$preseed_content =~ s/%DISTRIB%/$distrib/ ;
+	$preseed_content =~ s/%DISTSRC%/$dist_src/gs ;
+	$preseed_content =~ s/%DISTRIB%/$distrib/gs ;
 	
 	if ( ! open ( DST_PRESEED, ">/tmp/tmp_preseed" ) ) {
 		warn "Unable to create preseed file /tmp_preseed\n" ;
@@ -129,7 +129,7 @@
 				my $nam;
 				my $M = $host->{'SRVLIST'}->{$m};
 				my $debian_installer = 0 ;
-				$debian_installer = 1 if ( defined $M->{'deploymode'} && $M->{'deploymode'} eq 'debian-installer' ) ;
+				$debian_installer = 1 if ( defined $M->{'deploymode'} && $M->{'deploymode'} =~ /^(debian|ubuntu)-installer/ ) ;
 				foreach $nam ( sort ( keys %{ $M->{'zone'} } ) ) {
 					if ( $nam =~ /$dhcpvlanregex/ ) {
 						my $nam2 = $1;
@@ -166,7 +166,7 @@
 
 								my $template_name ;
 								if ( $debian_installer ) {
-									$template_name = $M->{'deploymode'} ;
+									$template_name = 'standard-installer' ;
 								}
 								else {
 									$template_name = $M->{'pxetemplate'} ? $M->{'pxetemplate'} : $default_template;
@@ -186,7 +186,7 @@
 
 								if ( $debian_installer ) {
 									# Building preseed file
-									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/ ;
+									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/gs ;
 									my $preseed_file = Build_preseed_filename ( $m, $M ) ;
 									# MD5sum on generated preseed file
 									$temptemplatecontent =~
@@ -198,9 +198,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' ;

Modified: trunk/templates/standard-installer
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/standard-installer?rev=615&op=diff
==============================================================================
--- trunk/templates/standard-installer (original)
+++ trunk/templates/standard-installer Wed Jul 30 13:27:49 2008
@@ -4,7 +4,7 @@
 DEFAULT linux
 
 LABEL install
-	kernel debian-installer/%ARCH%/linux
+	kernel %DEPLOYMODE%/%ARCH%/linux
 	append DEBCONF_PRIORITY=critical vga=normal auto=true initrd=%DEPLOYMODE%/%ARCH%/initrd.gz interface=eth0 netcfg/no_default_route=true url=%PRESEED_URL% url/checksum=%PRESEED_MD5% -- %CONSOLE% %CMDLINE%
 
 LABEL linux

Modified: trunk/templates/standard-preseed.tpl
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/standard-preseed.tpl?rev=615&op=diff
==============================================================================
--- trunk/templates/standard-preseed.tpl (original)
+++ trunk/templates/standard-preseed.tpl Wed Jul 30 13:27:49 2008
@@ -79,7 +79,7 @@
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 d-i apt-setup/services-select string multi-select security
-d-i apt-setup/security_host string deploy.private/debian-security
+d-i apt-setup/security_host string deploy.private/%DISTSRC%-security
 #d-i apt-setup/volatile_host string volatile.debian.org
 # Additional repositories, local[0-9] available
 d-i apt-setup/local0/repository string \