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
avoid boot hang
[automated-distro-installer]
/
myfai-chboot-local
diff --git
a/myfai-chboot-local
b/myfai-chboot-local
index 1845cd02d58c6c98114f3eaf4987e01cb1e699e3..b9b5537b613931a57a3227cb0f1ce4ac6f67ba5e 100755
(executable)
--- a/
myfai-chboot-local
+++ b/
myfai-chboot-local
@@
-108,7
+108,7
@@
kernel=$(fai-chboot -L '^default$' | awk '{print $3}')
default_k_args=$(fai-chboot -L '^default$' | \
sed -r "s/^(\S+\s+){3}(.*)/\2/")
# example of default_k_args
default_k_args=$(fai-chboot -L '^default$' | \
sed -r "s/^(\S+\s+){3}(.*)/\2/")
# 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
+# initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
k_args=(FAI_ACTION=$fai_action)
if $kgped16; then
k_args=(FAI_ACTION=$fai_action)
if $kgped16; then