From d73b02386a78d8a991feab5ab0310eab263050b2 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Fri, 27 May 2016 11:33:59 -0400 Subject: [PATCH] Adding quotes to the label and default tag. Without this, petitboot menu does not count down by default --- xCAT-server/lib/xcat/plugins/mknb.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm index eede1c6ae..0c84e8e16 100644 --- a/xCAT-server/lib/xcat/plugins/mknb.pm +++ b/xCAT-server/lib/xcat/plugins/mknb.pm @@ -252,8 +252,9 @@ CREAT_CONF_FILE: close($cfg); if ($invisibletouch and $arch =~ /x86_64/) { #UEFI time open($cfg,">","$tftpdir/xcat/xnba/nets/$net.elilo"); - print $cfg "default=\"xCAT Genesis\"\ndelay=5\n\n"; - print $cfg 'image=/tftpboot/xcat/genesis.kernel.'."$arch\n"; + print $cfg "default=\"xCAT Genesis (".$normnets->{$_}.")\"\n"; + print $cfg " delay=5\n"; + print $cfg ' image=/tftpboot/xcat/genesis.kernel.'."$arch\n"; print $cfg " label=\"xCAT Genesis (".$normnets->{$_}.")\"\n"; if ($lzma_exit_value) { print $cfg " initrd=/tftpboot/xcat/genesis.fs.$arch.gz\n"; @@ -270,8 +271,9 @@ CREAT_CONF_FILE: } elsif ($arch =~ /ppc/) { open($cfgfile,">", "$tftpdir/pxelinux.cfg/p/$net"); - print $cfgfile "default xCAT\n"; - print $cfgfile " label xCAT Genesis (".$normnets->{$_}.")\n"; + print $cfgfile "default \"xCAT Genesis (".$normnets->{$_}.")\"\n"; + print $cfgfile " delay=10\n"; + print $cfgfile " label \"xCAT Genesis (".$normnets->{$_}.")\"\n"; print $cfgfile " kernel http://".$normnets->{$_}.":80/$tftpdir/xcat/genesis.kernel.$arch\n"; print $cfgfile " initrd http://".$normnets->{$_}.":80/$initrd_file\n"; print $cfgfile ' append "quiet xcatd='.$normnets->{$_}.":$xcatdport $consolecmdline\"\n"; @@ -307,8 +309,9 @@ CREAT_CONF_FILE: close($cfgfile); } elsif ($arch =~ /ppc/) { open($cfgfile,">","$tftpdir/etc/".lc($_)); - print $cfgfile "default xCAT\n"; - print $cfgfile " label xCAT Genesis (".$normnets->{$_}.")\n"; + print $cfgfile "default \"xCAT Genesis (".$normnets->{$_}.")\"\n"; + print $cfgfile " delay=10\n"; + print $cfgfile " label \"xCAT Genesis (".$normnets->{$_}.")\"\n"; print $cfgfile " kernel http://".$hexnets->{$_}.":80/$tftpdir/xcat/genesis.kernel.$arch\n"; print $cfgfile " initrd http://".$hexnets->{$_}.":80/$initrd_file\n"; print $cfgfile ' append "quiet xcatd='.$hexnets->{$_}.":$xcatdport $consolecmdline\"\n";