allow direct kernel commands instead of tty+ttyS

1 files changed, 4 insertions, 17 deletions

diff --git a/create-boot-floppy b/create-boot-floppy
index 31e965c..2cb7a87 100755
--- a/create-boot-floppy
+++ b/create-boot-floppy
@@ -36,8 +36,7 @@ Options:
   -N, --nameserver	Nameserver of target system
   -S, --cosmos-hash	Hash used by cosmos to verify stuff
   -h, --help		this
-  --tty                 console number
-  --ttyS                serial console number
+  --inst-cmdline        add stuff to the install system kernel command line
 
 If --cosmos-hash is set to 'disabled', the kickstart stage should skip cosmos
 bootstrapping, and leave the system unmanaged.
@@ -97,12 +96,8 @@ function parse_commadline {
       TmpDir="${2}"
       shift
       ;;
-    --tty)
-      tty="${2}"
-      shift
-      ;;
-    --ttyS)
-      ttyS="${2}"
+    --inst-cmdline)
+      InstCmdLine="${2}"
       shift
       ;;
     *)
@@ -163,14 +158,6 @@ function check_options {
   else
     mkdir -p "${TmpDir}"
   fi
-  if [ "x${tty}" = "x" ]
-  then
-    tty=1
-  fi
-  if [ "x${ttyS}" = "x" ]
-  then
-    ttyS=1
-  fi
 }
 
 # Host="kas-fiona-10-02"
@@ -251,7 +238,7 @@ route
 ###
 # Set install parameters:
 set base http://\\$"{"ks"}"/install/centos/7/os/x86_64
-kernel \\$"{"base"}"/images/pxeboot/vmlinuz text console=tty${tty} console=ttyS${ttyS},115200n8 ip=\\$"{"ip"}" netmask=\\$"{"nm"}" gateway=\\$"{"gw"}" repo=\\$"{"base"}" ks=http://\\$"{"ks"}"/install/ks/\\$"{"hn"}".ks cosmoshash=${CosmosHash}
+kernel \\$"{"base"}"/images/pxeboot/vmlinuz text ${InstCmdLine} ip=\\$"{"ip"}" netmask=\\$"{"nm"}" gateway=\\$"{"gw"}" repo=\\$"{"base"}" ks=http://\\$"{"ks"}"/install/ks/\\$"{"hn"}".ks cosmoshash=${CosmosHash}
 initrd \\$"{"base"}"/images/pxeboot/initrd.img
 ###
 # Boot into install