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

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

Author: ccaillet-guest
Date: Wed Jul 30 13:06:46 2008
New Revision: 613

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

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

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=613&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Wed Jul 30 13:06:46 2008
@@ -75,7 +75,7 @@
 # Allowed architecture
 my $ALLOWED_ARCH = 'i386|amd64' ;
 # Allowed deploymode
-my $ALLOWED_DEPLOYMODE = 'pf-tools|debian-installer' ;
+my $ALLOWED_DEPLOYMODE = 'pf-tools|(debian|ubuntu)-installer' ;
 
 
 #=======================================================#
@@ -940,6 +940,7 @@
 		'deploymode',
 		'dns',
 		'arch',
+		'distrib'
 		'initrd',
 		'cmdline',
 		'console'

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=613&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Wed Jul 30 13:06:46 2008
@@ -68,6 +68,14 @@
 	close ( PRESEED_TPL ) ;
 	my $deb_kernel = Get_kpkg_from_pxefilename ( $ref_srv->{'pxefilename'} ) ;
 	$preseed_content =~ s/%KERNELPKG%/$deb_kernel/gs ;
+	
+	my $distrib	= $ref_srv->{'distrib'} ;
+	my $dist_src	= $ref_srv->{'deploymode'} ;
+	$dist_src	=~ s/^(debian|ubuntu)-installer/$1/ ;
+	
+	$preseed_content =~ s/%DISTSRC%/$dist_src/ ;
+	$preseed_content =~ s/%DISTRIB%/$distrib/ ;
+	
 	if ( ! open ( DST_PRESEED, ">/tmp/tmp_preseed" ) ) {
 		warn "Unable to create preseed file /tmp_preseed\n" ;
 		return $DEFAULT_PRESEED ;
@@ -178,6 +186,7 @@
 
 								if ( $debian_installer ) {
 									# Building preseed file
+									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/ ;
 									my $preseed_file = Build_preseed_filename ( $m, $M ) ;
 									# MD5sum on generated preseed file
 									$temptemplatecontent =~

Modified: trunk/templates/debian-installer
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/debian-installer?rev=613&op=diff
==============================================================================
--- trunk/templates/debian-installer (original)
+++ trunk/templates/debian-installer Wed Jul 30 13:06:46 2008
@@ -1,11 +1,11 @@
 SERIAL 0 %SERIAL_SPEED% 2
-DISPLAY debian-installer/%ARCH%/boot-screens/myboot.txt
+DISPLAY %DEPLOYMODE%/%ARCH%/boot-screens/myboot.txt
 
 DEFAULT linux
 
 LABEL install
 	kernel debian-installer/%ARCH%/linux
-	append DEBCONF_PRIORITY=critical vga=normal auto=true initrd=debian-installer/%ARCH%/initrd.gz interface=eth0 netcfg/no_default_route=true url=%PRESEED_URL% url/checksum=%PRESEED_MD5% -- %CONSOLE% %CMDLINE%
+	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
 	kernel %KERNEL%

Modified: trunk/templates/debian-preseed.tpl
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/debian-preseed.tpl?rev=613&op=diff
==============================================================================
--- trunk/templates/debian-preseed.tpl (original)
+++ trunk/templates/debian-preseed.tpl Wed Jul 30 13:06:46 2008
@@ -23,11 +23,11 @@
 d-i mirror/protocol string http
 d-i mirror/country string enter information manually
 d-i mirror/http/hostname string deploy.private
-d-i mirror/http/directory string /debian
+d-i mirror/http/directory string /%DISTSRC%
 d-i mirror/http/proxy string
 
 # Suite to install.
-d-i mirror/suite string etch
+d-i mirror/suite string %DISTRIB%
 
 ### Clock and time zone setup
 d-i clock-setup/utc boolean false
@@ -58,7 +58,7 @@
               .                                             \
               64 512 100% linux-swap                        \
                      method{ swap } format{ }               \
-              .                                             
+
 d-i partman/confirm_write_new_label boolean true
 d-i partman/choose_partition \
        select Finish partitioning and write changes to disk
@@ -83,7 +83,7 @@
 #d-i apt-setup/volatile_host string volatile.debian.org
 # Additional repositories, local[0-9] available
 d-i apt-setup/local0/repository string \
-       http://deploy.private/debian-custom etch common
+       http://deploy.private/%DISTSRC%-custom %DISTRIB% common
 #d-i apt-setup/local0/key string http://local.server/key
 # By default the installer requires that repositories be authenticated
 # using a known gpg key. This setting can be used to disable that