pf-tools commit: r623 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Net.pm sbin/mk_pxelinuxcfg

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

Author: ccaillet-guest
Date: Mon Aug  4 15:13:05 2008
New Revision: 623

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=623
Log:
* Fix: add a warning if no kernel is retrieved by Get_Active_Filename
* 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 

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Net.pm
    trunk/sbin/mk_pxelinuxcfg

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=623&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Aug  4 15:13:05 2008
@@ -4,8 +4,11 @@
   * Add: sources.list.tpl
   * Add: filter_distrib for extracting distribution and origin for
     configuration file from private-network definitions 
-
- -- Christophe Caillet <tof at sitadelle.com>  Mon, 04 Aug 2008 14:00:00 +0200
+  * Fix: add a warning if no kernel is retrieved by Get_Active_Filename
+  * 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 
+
+ -- Christophe Caillet <tof at sitadelle.com>  Mon, 04 Aug 2008 17:11:40 +0200
 
 pf-tools (0.33-0+RC2) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=623&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Mon Aug  4 15:13:05 2008
@@ -674,8 +674,8 @@
 	return undef;
     }
 
-    return ( $M->{'umlfilename'} ) if ($PFTOOLS_VARS->{'UML'});
-    return ( $M->{'vmwfilename'} ) if ($PFTOOLS_VARS->{'VMWARE'});
+    return ( $M->{'umlfilename'} ) if ($PFTOOLS_VARS->{'UML'} && defined $M->{'umlfilename'});
+    return ( $M->{'vmwfilename'} ) if ($PFTOOLS_VARS->{'VMWARE'} && defined $M->{'vmwfilename'});
     if ( $M->{'arch'} eq 'amd64' ) {
 	return ( $M->{'arch'}."/".$M->{'pxefilename'} );
     }

Modified: trunk/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/trunk/sbin/mk_pxelinuxcfg?rev=623&op=diff
==============================================================================
--- trunk/sbin/mk_pxelinuxcfg (original)
+++ trunk/sbin/mk_pxelinuxcfg Mon Aug  4 15:13:05 2008
@@ -182,6 +182,9 @@
 	
 								my $temptemplatecontent = join '', @{ $templates->{$template_name} };
 								my $kernel_filename	= Get_Active_Filename ( $Z, $m ) ;
+								if ( ! defined $kernel_filename ) {
+									warn "Unable to retrieve kernel filename for host ".$m."\n" ;
+								}
 								$temptemplatecontent =~ s/%KERNEL%/$kernel_filename/gs;
 
 								if ( $debian_installer ) {