[lml] push by schl...@schapiro.org - * BUGFIX make sure that we don't take directories for configuration fi... on 2011-12-27 16:09 GMT

[l...@googlecode.com]

Revision: 24a2eb52aef0
Author: Schlomo Schapiro <l...@schlomo.schapiro.org>
Date: Tue Dec 27 08:09:49 2011
Log: * BUGFIX make sure that we don't take directories for
configuration files...
http://code.google.com/p/lml/source/detail?r=24a2eb52aef0

Modified:
/web/www/boot/lml/pxelinux.pl

=======================================
--- /web/www/boot/lml/pxelinux.pl Tue Dec 27 07:49:05 2011
+++ /web/www/boot/lml/pxelinux.pl Tue Dec 27 08:09:49 2011
@@ -308,7 +308,7 @@
$forceboot =~ s/\.{2,}//g; # remove any .. or ...
$forceboot =~ tr[:/A-Za-z0-9._-][]dc; # normalize to contain only valid
path characters
# if forceboot contains a path relative to the pxelinux TFTP prefix
- if (-r $CONFIG{pxelinux}{pxelinuxcfg_path}."/".$forceboot) {
+ if (-r $CONFIG{pxelinux}{pxelinuxcfg_path}."/".$forceboot and ! -d
$CONFIG{pxelinux}{pxelinuxcfg_path}."/".$forceboot) {
$pxelinux_config_url="$tftp_url/$forceboot";
$bootinfo="force boot from VM config (file)";
} elsif ($CONFIG{forceboot}{$forceboot}) {