pf-tools commit: r757 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Net.pm sbin/mk_pxelinuxcfg templates/standard-installer templates/ubuntu-installer
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Tue Jun 8 12:20:45 UTC 2010
Author: ccaillet-guest
Date: Tue Jun 8 12:20:26 2010
New Revision: 757
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=757
Log:
* Major feature enhancement : officially support Ubuntu
- remove Warn if initrd is defined when deploymode is debian-installer
or ubuntu-installer
- restore initrd directive on PXE file for Ubuntu or Debian
Modified:
branches/0.33-stable/debian/changelog
branches/0.33-stable/lib/PFTools/Net.pm
branches/0.33-stable/sbin/mk_pxelinuxcfg
branches/0.33-stable/templates/standard-installer
branches/0.33-stable/templates/ubuntu-installer
Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=757&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Jun 8 12:20:26 2010
@@ -1,16 +1,19 @@
pf-tools (0.33.20-1) unstable; urgency=low
[ Christophe Caillet ]
+ * Major feature enhancement : officially support Ubuntu
* lib/PFTools/Net.pm
- in Add_Network : fix th check for avoiding duplicate network, replacing
Abort by Warn. Sometimes we need to have same subnets on different sites,
is commented, waiting for activation if needed.
- in Add_Server : adding the possibility for "undefining" an interface for
a particular numbered host with the special value "NONE"
+ - remove Warn if initrd is defined when deploymode is debian-installer
+ or ubuntu-installer
* sbin/mk_pxelinuxcfg :
- use specific templates for ubuntu distros
- improve function for handling ubuntu kernel standard name
- - use %RUN_INITRD% var for defining initrd directive on PXE file for Ubuntu
+ - restore initrd directive on PXE file for Ubuntu or Debian
* sbin/mk_grub2opt : small fix on cmdline substitution
* sbin/mk_sourceslist : use specific templates for ubuntu distros
* adding ubuntu specific templates for PXE, preseed and sources.list files
@@ -30,7 +33,7 @@
cmdline defined into host definition
* debian/control : fixing deps for libmd5-perl which is included in perl >= 5.10
- -- Christophe Caillet <tof at sitadelle.com> Tue, 08 Jun 2010 10:47:13 +0200
+ -- Christophe Caillet <quadchris at free.fr> Tue, 08 Jun 2010 14:20:28 +0200
pf-tools (0.33.19-1) unstable; urgency=low
Modified: branches/0.33-stable/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Net.pm?rev=757&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Tue Jun 8 12:20:26 2010
@@ -1009,8 +1009,7 @@
} elsif ( $key eq 'deploymode' ) {
Abort ( $ERR_SYNTAX, "Invalid deploymode key for host ".$srv.$mnamindexnum." : ".$S->{$key}->{$mnamindexnum} )
if ( $S->{$key}->{$mnamindexnum} !~ /^$ALLOWED_DEPLOYMODE$/ ) ;
- Warn ( $ERR_SYNTAX, "No need to defined initrd for host ".$srv.$mnamindexnum ) if ( defined $S->{'initrd'}->{$mnamindexnum} ) ;
- }
+ }
$M->{$key} = $S->{$key}->{$mnamindexnum} ;
}
elsif ( defined ( $S->{$key}->{'default'} ) ) {
@@ -1020,9 +1019,7 @@
elsif ( $key eq 'deploymode' ) {
Abort( $ERR_SYNTAX, "Invalid default deploymode key $S->{$key}->{'default'}" )
if $S->{$key}->{'default'} !~ m/^$ALLOWED_DEPLOYMODE$/;
- Warn( $ERR_SYNTAX, "No need to define initrd for host $srv" )
- if defined $S->{'initrd'}->{'default'};
- }
+ }
$M->{$key} = $S->{$key}->{'default'} ;
}
elsif ( $key eq 'deploymode' ) {
Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=757&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Tue Jun 8 12:20:26 2010
@@ -203,15 +203,11 @@
# Building preseed file
$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/gs ;
$temptemplatecontent =~ s/%DISTRIB%/$M->{'distrib'}/gs ;
- if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
- $kernel_filename =~ /vmlinuz-(.+)$/ ;
- my $version = $1;
- 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 ;
- }
+ if ( defined $M->{'initrd'} ) {
+ $temptemplatecontent =~ s/%INITRD%/$M->{'initrd'}/gs ;
+ }
+ else {
+ $temptemplatecontent =~ s/initrd=([^\s]*)%INITRD%//gs ;
}
my $preseed_file;
if ( $M->{'deploymode'} =~ /^ubuntu/ ) {
Modified: branches/0.33-stable/templates/standard-installer
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/templates/standard-installer?rev=757&op=diff
==============================================================================
--- branches/0.33-stable/templates/standard-installer (original)
+++ branches/0.33-stable/templates/standard-installer Tue Jun 8 12:20:26 2010
@@ -9,7 +9,7 @@
LABEL linux
kernel %KERNEL%
- append vga=normal root=/dev/sda2 -- %CONSOLE% %CMDLINE%
+ append vga=normal root=/dev/sda2 initrd=%INITRD% -- %CONSOLE% %CMDLINE%
PROMPT 1
TIMEOUT 100
Modified: branches/0.33-stable/templates/ubuntu-installer
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/templates/ubuntu-installer?rev=757&op=diff
==============================================================================
--- branches/0.33-stable/templates/ubuntu-installer (original)
+++ branches/0.33-stable/templates/ubuntu-installer Tue Jun 8 12:20:26 2010
@@ -9,7 +9,7 @@
LABEL linux
kernel %KERNEL%
- append vga=normal root=/dev/sda2 %RUN_INITRD% -- %CONSOLE% %CMDLINE%
+ append vga=normal root=/dev/sda2 initrd=%INITRD% -- %CONSOLE% %CMDLINE%
PROMPT 1
TIMEOUT 100
More information about the pf-tools-commits
mailing list