From 79f816a417f7a6137e8e0e822871216a35d3337e Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 15 Sep 2009 17:59:11 +0000
Subject: [PATCH] -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
---
 xCAT-server/lib/xcat/plugins/anaconda.pm | 4 ++--
 xCAT-server/lib/xcat/plugins/destiny.pm  | 2 +-
 xCAT-server/lib/xcat/plugins/mknb.pm     | 2 +-
 xCAT-server/lib/xcat/plugins/sles.pm     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 97dc16940..0636e44bb 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -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)/)
diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index e6b3e3c0f..fce71e6b8 100644
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -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]});
diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index 2aa41e782..575cd7716 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -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";
       } 
diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index ab6bbdce1..e2a1566af 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -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)/))