iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes
[automated-distro-installer]
/
myfai-chboot-local
diff --git
a/myfai-chboot-local
b/myfai-chboot-local
index f46c32d9308c33a4277402cd6a9e1818848708aa..63a7301090d132f95bbdb475adbdfc1f4a65e9a4 100755
(executable)
--- a/
myfai-chboot-local
+++ b/
myfai-chboot-local
@@
-104,7
+104,11
@@
default_k_args=$(fai-chboot -L '^default$' | \
# example of default_k_args
# initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot aufs FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
# example of default_k_args
# initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot aufs FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
-k_args=(console=tty0 console=ttyS0,115200 FAI_ACTION=$fai_action)
+k_args=(FAI_ACTION=$fai_action)
+if $kgped16; then
+ k_args+=(console=tty0 console=ttyS0,115200)
+fi
+
for arg in $default_k_args; do
case $arg in
# default root arg is /srv/fai/nfsroot
for arg in $default_k_args; do
case $arg in
# default root arg is /srv/fai/nfsroot