pf-tools commit: r647 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog sbin/mk_pxelinuxcfg templates/standard-installer

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

Author: ccaillet-guest
Date: Wed Sep 10 13:25:03 2008
New Revision: 647

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=647
Log:
Backport r646 from trunk for pressed server hardcoded value

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/sbin/mk_pxelinuxcfg
    branches/0.33-stable/templates/standard-installer

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=647&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Wed Sep 10 13:25:03 2008
@@ -1,3 +1,9 @@
+pf-tools (0.33.6-1) unstable; urgency=low
+
+  * Backport r646 from trunk for pressed server hardcoded value
+
+ -- Christophe Caillet <quadchris at free.fr>  Wed, 10 Sep 2008 15:23:44 +0200
+
 pf-tools (0.33.5-1) unstable; urgency=low
 
   * Backport from trunk (r643) for fixing /etc/pf-tools.conf handling on

Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=647&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Wed Sep 10 13:25:03 2008
@@ -193,7 +193,7 @@
 									my $preseed_file = Build_preseed_filename ( $m, $M ) ;
 									# MD5sum on generated preseed file
 									$temptemplatecontent =~
-										s/%PRESEED_URL%/http:\/\/deploy.private\/preseed\/$preseed_file/gs;
+										s/%PRESEED_URL%/preseed\/$preseed_file/gs;
 									my $preseed_md5 = Get_MD5SUM_from_preseedfilename ( $preseed_file ) ;
 									if ( ! defined $preseed_md5 ) {
 										die "Unable to get md5dum for preseed filename "

Modified: branches/0.33-stable/templates/standard-installer
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/templates/standard-installer?rev=647&op=diff
==============================================================================
--- branches/0.33-stable/templates/standard-installer (original)
+++ branches/0.33-stable/templates/standard-installer Wed Sep 10 13:25:03 2008
@@ -5,7 +5,7 @@
 
 LABEL install
 	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%
+	append DEBCONF_PRIORITY=critical vga=normal auto=true initrd=%DEPLOYMODE%/%ARCH%/initrd.gz interface=eth0 netcfg/no_default_route=true url=http://vip-deploy.private/%PRESEED_URL% url/checksum=%PRESEED_MD5% -- %CONSOLE% %CMDLINE%
 
 LABEL linux
 	kernel %KERNEL%