From f3bbc59feda72163c0a4635d020b4a1caac1e220 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 25 Feb 2008 14:37:58 +0000 Subject: [PATCH] Fix mknb to correctly use site entries for default serial console git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@563 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/lib/xcat/plugins/mknb.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server-2.0/lib/xcat/plugins/mknb.pm b/xCAT-server-2.0/lib/xcat/plugins/mknb.pm index 07c594230..6fdd375d5 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/mknb.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/mknb.pm @@ -19,19 +19,19 @@ sub process_request { my $serialflow; my $xcatdport = 3001; if ($sitetab) { - my $portent = $sitetab->getAttribs({key=>'defserialport'}); + my $portent = $sitetab->getAttribs({key=>'defserialport'},'value'); if ($portent and defined($portent->{value})) { $serialport=$portent->{value}; } - $portent = $sitetab->getAttribs({key=>'defserialspeed'}); + $portent = $sitetab->getAttribs({key=>'defserialspeed'},'value'); if ($portent and defined($portent->{value})) { $serialspeed=$portent->{value}; } - $portent = $sitetab->getAttribs({key=>'defserialflow'}); + $portent = $sitetab->getAttribs({key=>'defserialflow'},'value'); if ($portent and defined($portent->{value})) { $serialflow=$portent->{value}; } - $portent = $sitetab->getAttribs({key=>'xcatdport'}); + $portent = $sitetab->getAttribs({key=>'xcatdport'},'value'); if ($portent and defined($portent->{value})) { $xcatdport=$portent->{value}; } @@ -84,7 +84,7 @@ sub process_request { system ("rm -rf $temdir"); my $hexnets = xCAT::Utils->my_hexnets(); my $consolecmdline; - if ($serialport and $serialspeed) { + if (defined($serialport) and $serialspeed) { $consolecmdline = "console=ttyS$serialport,$serialspeed"; if ($serialflow =~ /cts/ or $serialflow =~ /hard/) { $consolecmdline .= "n8r";