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
changes for buster linode
[automated-distro-installer]
/
myfai-chboot-local
diff --git
a/myfai-chboot-local
b/myfai-chboot-local
index f46c32d9308c33a4277402cd6a9e1818848708aa..3ecc7d13f83d5b3beb8af69327faca4c875f56ad 100755
(executable)
--- a/
myfai-chboot-local
+++ b/
myfai-chboot-local
@@
-1,29
+1,36
@@
#!/bin/bash
#!/bin/bash
-
# note, this script gets piped to bash, so cant cd to current dir
# note, this script gets piped to bash, so cant cd to current dir
+
+[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+kgped16=false
fai_action=install
fai_reboot_arg=,reboot
fai_action=install
fai_reboot_arg=,reboot
-case $1 in
- -h|--help)
- echo "see help from myfai-chboot"
- exit 0
- ;;
- -S)
- fai_action=sysinfo
- fai_reboot_arg=
- shift
- ;;
- -i) #inventory
- fai_action=inventory
- fai_reboot_arg=
- shift
- ;;
-esac
-
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+while [[ $1 == -* ]]; do
+ case $1 in
+ -h|--help)
+ echo "see help from myfai-chboot"
+ exit 0
+ ;;
+ -S)
+ fai_action=sysinfo
+ fai_reboot_arg=
+ shift
+ ;;
+ -i) #inventory
+ fai_action=inventory
+ fai_reboot_arg=
+ shift
+ ;;
+ -k)
+ kgped16=true;
+ shift
+ ;;
+ esac
+done
e() {
echo "$*"
e() {
echo "$*"
@@
-37,6
+44,7
@@
host=$1
rm -f /srv/tftp/fai/pxelinux.cfg/*
if [[ ! $1 ]]; then
rm -f /srv/tftp/fai/pxelinux.cfg/*
if [[ ! $1 ]]; then
+ echo "$0: clearing pxe config and exiting"
exit 0
fi
exit 0
fi
@@
-76,7
+84,7
@@
if modprobe nfsd &>/dev/null; then
if [[ -w /etc/exports ]]; then
sed -ri --follow-symlinks '\%^/srv/fai/%d' /etc/exports
cat >>/etc/exports <<EOF
if [[ -w /etc/exports ]]; then
sed -ri --follow-symlinks '\%^/srv/fai/%d' /etc/exports
cat >>/etc/exports <<EOF
-/srv/fai/config $ip(async,ro,no_subtree_check)
+/srv/fai/config $ip(async,ro,no_subtree_check
,no_root_squash
)
/srv/fai/nfsroot $ip(async,ro,no_subtree_check,no_root_squash)
EOF
exportfs -ra
/srv/fai/nfsroot $ip(async,ro,no_subtree_check,no_root_squash)
EOF
exportfs -ra
@@
-104,7
+112,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