pf-tools commit: r625 [ccaillet-guest] - in /trunk: debian/changelog sbin/mk_dhcp

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

Author: ccaillet-guest
Date: Tue Aug  5 13:51:30 2008
New Revision: 625

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=625
Log:
Fix: displaying correct pxefilename in comment line into dhcpd
configuration file according to architecture defined in private-network

Modified:
    trunk/debian/changelog
    trunk/sbin/mk_dhcp

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=625&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Aug  5 13:51:30 2008
@@ -8,8 +8,10 @@
   * Fix: give the right uml or vmware kernel only if this file is defined on
     private-network definitions, if not use the standard pxefilename directive 
   * Fix: typo on partman-auto section of preseed template
-
- -- Christophe Caillet <quadchris at free.fr>  Tue, 05 Aug 2008 11:46:43 +0200
+  * Fix: displaying correct pxefilename in comment line into dhcpd
+    configuration file according to architecture defined in private-network
+
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 05 Aug 2008 15:50:04 +0200
 
 pf-tools (0.33-0+RC2) unstable; urgency=low
 

Modified: trunk/sbin/mk_dhcp
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_dhcp?rev=625&op=diff
==============================================================================
--- trunk/sbin/mk_dhcp (original)
+++ trunk/sbin/mk_dhcp Tue Aug  5 13:51:30 2008
@@ -101,7 +101,12 @@
 			    if ( $M->{'console'} ) { printf qq{# console "%s";\n}, $M->{'console'}; }
 
 			    if ( defined( $M->{'pxefilename'} ) && $M->{'pxefilename'} ne "" ) {
-				printf( "# pxefilename \"%s\";\n", $M->{'pxefilename'} );
+				if ( $M->{'arch'} eq 'amd64' ) {
+				    printf( "# pxefilename \"%s\";\n", $M->{'arch'}."/".$M->{'pxefilename'} );
+				}
+				else {
+				    printf( "# pxefilename \"%s\";\n", $M->{'pxefilename'} );
+				}
 			    }
 
 			    if ( defined( $M->{'pxelinuxconf'} ) && $M->{'pxelinuxconf'} ne "" ) {