From 4ec9909870fee4bd3fb008c27be66ede9aa3c64e Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 24 Aug 2009 18:17:31 +0000 Subject: [PATCH] -Fix defect 2843639, load pxelinux before 'memdisk' images as memdisk seems to be unhappy trying to run under xNBA directly git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4034 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/pxe.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm index 59db3fb83..55d9f048a 100644 --- a/xCAT-server/lib/xcat/plugins/pxe.pm +++ b/xCAT-server/lib/xcat/plugins/pxe.pm @@ -125,7 +125,7 @@ sub setstate { print $pcfg "DEFAULT xCAT\nLABEL xCAT\n KERNEL mboot.c32\n"; print $pcfg " APPEND $hypervisor --- $kernel ".$kern->{kcmdline}." --- ".$kern->{initrd}."\n"; } else { - if ($kern->{kernel} =~ /\.c32\z/) { #gPXE comboot support seems insufficient, chain pxelinux instead + if ($kern->{kernel} =~ /\.c32\z/ or $kern->{kernel} eq 'memdisk') { #gPXE comboot support seems insufficient, chain pxelinux instead print $pcfg " set 209:string xcat/xnba/nodes/$node.pxelinux\n"; print $pcfg " set 210:string http://".'${next-server}'."/tftpboot/\n"; print $pcfg " imgfetch -n pxelinux.0 http://".'${next-server}'."/tftpboot/pxelinux.0\n";