From fd0f85a9148773928b329e276d67922e0674111a Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 18 Oct 2011 17:45:51 +0000
Subject: [PATCH] Change in strategy, go cmdline if serial console in use, if
 no console that would reasonably be expected to log/copy paste in play, let
 the installer go graphical

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10830 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/anaconda.pm                    | 5 +++--
 xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl | 4 +---
 xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl       | 5 ++---
 xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl    | 6 ------
 xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl           | 5 ++---
 xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl           | 5 ++---
 xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl | 5 ++---
 7 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 9a01b2a86..7697f6b38 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -1109,7 +1109,7 @@ sub mkinstall
                 next;
             }
             my $kcmdline =
-                "cmdline utf8 ks=http://"
+                "ks=http://"
               . $ent->{nfsserver}
               . "/install/autoinst/"
               . $node;
@@ -1176,8 +1176,9 @@ sub mkinstall
                         );
                     next;
                 }
+		#go cmdline if serial console is requested, the shiny ansi is just impractical
                 $kcmdline .=
-                    " console=tty0 console=ttyS"
+                    "cmdline console=tty0 console=ttyS"
                   . $sent->{serialport} . ","
                   . $sent->{serialspeed};
                 if ($sent->{serialflow} =~ /(hard|cts|ctsrts)/)
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
index 50dc384f1..ebd9c11f0 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
@@ -1,6 +1,4 @@
-#egan@us.ibm.com
 #
-cmdline
 
 lang en_US
 network --bootproto dhcp
@@ -84,7 +82,7 @@ install
 #
 # text mode install (default is graphical)
 #
-text
+#text
 
 #
 # firewall
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
index 60f4285cc..9ffa7b55b 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
@@ -1,6 +1,5 @@
-#egan@us.ibm.com
 #
-cmdline
+#cmdline
 
 lang en_US
 
@@ -83,7 +82,7 @@ install
 #
 # text mode install (default is graphical)
 #
-text
+#text
 
 #
 # firewall
diff --git a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
index db545d592..c4b4067ef 100644
--- a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
@@ -1,6 +1,5 @@
 #egan@us.ibm.com
 #
-cmdline
 
 lang en_US
 
@@ -80,11 +79,6 @@ bootloader
 #
 install
 
-#
-# text mode install (default is graphical)
-#
-text
-
 #
 # firewall
 #
diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
index 60f4285cc..9ffa7b55b 100644
--- a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
@@ -1,6 +1,5 @@
-#egan@us.ibm.com
 #
-cmdline
+#cmdline
 
 lang en_US
 
@@ -83,7 +82,7 @@ install
 #
 # text mode install (default is graphical)
 #
-text
+#text
 
 #
 # firewall
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
index 60f4285cc..9ffa7b55b 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
@@ -1,6 +1,5 @@
-#egan@us.ibm.com
 #
-cmdline
+#cmdline
 
 lang en_US
 
@@ -83,7 +82,7 @@ install
 #
 # text mode install (default is graphical)
 #
-text
+#text
 
 #
 # firewall
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
index 149255612..e2eb18b47 100644
--- a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
@@ -1,6 +1,5 @@
-#egan@us.ibm.com
 #
-cmdline
+#cmdline
 
 lang en_US
 network --bootproto dhcp
@@ -85,7 +84,7 @@ install
 #
 # text mode install (default is graphical)
 #
-text
+#text
 
 #
 # firewall