-Add console=tty0 for all serialport consoles.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4138 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
87d9af0097
commit
79f816a417
@ -355,7 +355,7 @@ sub mknetboot
|
||||
next;
|
||||
}
|
||||
$kcmdline .=
|
||||
"console=ttyS" . $sent->{serialport} . "," . $sent->{serialspeed};
|
||||
"console=tty0 console=ttyS" . $sent->{serialport} . "," . $sent->{serialspeed};
|
||||
if ($sent->{serialflow} =~ /(hard|tcs|ctsrts)/)
|
||||
{
|
||||
$kcmdline .= "n8r";
|
||||
@ -616,7 +616,7 @@ sub mkinstall
|
||||
next;
|
||||
}
|
||||
$kcmdline .=
|
||||
" console=ttyS"
|
||||
" console=tty0 console=ttyS"
|
||||
. $sent->{serialport} . ","
|
||||
. $sent->{serialspeed};
|
||||
if ($sent->{serialflow} =~ /(hard|cts|ctsrts)/)
|
||||
|
@ -206,7 +206,7 @@ sub setdestiny {
|
||||
}
|
||||
$ent = $hments->{$_}->[0]; #$nodehm->getNodeAttribs($_,['serialport','serialspeed','serialflow']);
|
||||
if ($ent and defined($ent->{serialport})) {
|
||||
$kcmdline .= "console=ttyS".$ent->{serialport};
|
||||
$kcmdline .= "console=tty0 console=ttyS".$ent->{serialport};
|
||||
#$ent = $nodehm->getNodeAttribs($_,['serialspeed']);
|
||||
unless ($ent and defined($ent->{serialspeed})) {
|
||||
$callback->({error=>["Serial port defined in noderes, but no nodehm.serialspeed set for $_"],errorcode=>[1]});
|
||||
|
@ -98,7 +98,7 @@ sub process_request {
|
||||
my $normnets = xCAT::Utils->my_nets();
|
||||
my $consolecmdline;
|
||||
if (defined($serialport) and $serialspeed) {
|
||||
$consolecmdline = "console=ttyS$serialport,$serialspeed";
|
||||
$consolecmdline = "console=tty0 console=ttyS$serialport,$serialspeed";
|
||||
if ($serialflow =~ /cts/ or $serialflow =~ /hard/) {
|
||||
$consolecmdline .= "n8r";
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ sub mknetboot
|
||||
next;
|
||||
}
|
||||
$kcmdline .=
|
||||
"console=ttyS" . $sent->{serialport} . "," . $sent->{serialspeed};
|
||||
"console=tty0 console=ttyS" . $sent->{serialport} . "," . $sent->{serialspeed};
|
||||
if ($sent->{serialflow} =~ /(hard|tcs|ctsrts)/)
|
||||
{
|
||||
$kcmdline .= "n8r";
|
||||
@ -450,7 +450,7 @@ sub mkinstall
|
||||
next;
|
||||
}
|
||||
$kcmdline .=
|
||||
" console=ttyS"
|
||||
" console=tty0 console=ttyS"
|
||||
. $sent->{serialport} . ","
|
||||
. $sent->{serialspeed};
|
||||
if ($sent and ($sent->{serialflow} =~ /(ctsrts|cts|hard)/))
|
||||
|
Loading…
Reference in New Issue
Block a user