pf-tools commit: r646 [ccaillet-guest] - in /trunk: debian/changelog sbin/mk_pxelinuxcfg templates/standard-installer

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

Author: ccaillet-guest
Date: Wed Sep 10 12:51:10 2008
New Revision: 646

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=646
Log:
Transfering hardcoded value from mk_pxelinuxcfg to template
standard-installer for defining preseed server 

Modified:
    trunk/debian/changelog
    trunk/sbin/mk_pxelinuxcfg
    trunk/templates/standard-installer

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=646&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Sep 10 12:51:10 2008
@@ -5,8 +5,10 @@
   * Forward port commit 638 from 0.33-stable branch 
   * Forward port commit 641 from 0.33-stable branch
   * Fix parsing for /etc/pf-tools.conf file on Update.pm
-
- -- Christophe Caillet <tof at sitadelle.com>  Wed, 10 Sep 2008 14:02:37 +0200
+  * Transfering hardcoded value from mk_pxelinuxcfg to template
+    standard-installer for defining preseed server 
+
+ -- Christophe Caillet <quadchris at free.fr>  Wed, 10 Sep 2008 14:48:06 +0200
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=646&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Wed Sep 10 12:51:10 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: trunk/templates/standard-installer
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/standard-installer?rev=646&op=diff
==============================================================================
--- trunk/templates/standard-installer (original)
+++ trunk/templates/standard-installer Wed Sep 10 12:51:10 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.vlan-systeme.private/%PRESEED_URL% url/checksum=%PRESEED_MD5% -- %CONSOLE% %CMDLINE%
 
 LABEL linux
 	kernel %KERNEL%