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
This commit is contained in:
parent
7cdee0d9f1
commit
f3bbc59fed
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user