allow direct kernel commands instead of tty+ttyS

1 files changed, 8 insertions, 9 deletions

diff --git a/prep-boot-floppy-and-ks-config b/prep-boot-floppy-and-ks-config
index 9fd45a7..2a9883f 100755
--- a/prep-boot-floppy-and-ks-config
+++ b/prep-boot-floppy-and-ks-config
@@ -43,10 +43,10 @@ Options:
                         name of the template file. Example:
                             supermicro/SYS-5018D-FN8T/dtn-10g.ks
                             dell/R7425/100g-dtn.ks
+  --inst-cmdline        add stuff to the install system kernel command line
+  --krnl-cmdline        add stuff to the install system kernel command line
   --sec-ip              IP of secondary interface
   --sec-nm              Netmask of secondary interface
-  --tty                 console number
-  --ttyS                serial console number
   -h, --help            this
 
 If --cosmos-hash is set to 'disabled', the kickstart stage should skip cosmos
@@ -113,12 +113,12 @@ function parse_commadline {
       TemplateOpt="--template ${2}"
       shift
       ;;
-    --tty)
-      tty="${2}"
+    --inst-cmdline)
+      InstCmdLineOpt="--inst-cmdline ${2}"
       shift
       ;;
-    --ttyS)
-      ttyS="${2}"
+    --krnl-cmdline)
+      KrnlCmdLineOpt="--krnl-cmdline ${2}"
       shift
       ;;
     *)
@@ -212,12 +212,11 @@ ScriptPath=$(echo $0 | sed -e "s#/${Self}##")
 #echo $ScriptPath
 
 ${ScriptPath}/create-boot-floppy -D ${Domain} -G ${GW} -H ${Host} \
-  -I ${IP} -M ${NM} -T ${TmpDir} -P ${PublishPath} --tty "${tty}" \
-  --ttyS "${ttyS}"
+  -I ${IP} -M ${NM} -T ${TmpDir} -P ${PublishPath} ${InstCmdLineOpt}
 
 ${ScriptPath}/adapt-ks-template -D ${Domain} -G ${GW} -H ${Host} \
   -I ${IP} -M ${NM} -T ${TmpDir} -P ${PublishPath} --sec-ip ${SecIP} \
-  --sec-nm ${SecNM} ${TemplateOpt} --tty "${tty}" --ttyS "${ttyS}"
+  --sec-nm ${SecNM} ${TemplateOpt} ${KrnlCmdLineOpt}
 
 # When this script calls the other two, PublishPath *is* set, so expect
 # everything of value to be evacuated, and just clean up: