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 bullseye
[automated-distro-installer]
/
myfai-chboot-local
diff --git
a/myfai-chboot-local
b/myfai-chboot-local
index 5140f68bb73f349bdf741974b1fbef7e7ba076c5..1845cd02d58c6c98114f3eaf4987e01cb1e699e3 100755
(executable)
--- a/
myfai-chboot-local
+++ b/
myfai-chboot-local
@@
-1,5
+1,8
@@
#!/bin/bash
# note, this script gets piped to bash, so cant cd to current dir
#!/bin/bash
# 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
@@
-29,15
+32,10
@@
while [[ $1 == -* ]]; do
esac
done
esac
done
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
-
-e() {
- echo "$*"
- if ! "$@"; then
- echo "$0: error: exit code $? from: $*"
- exit 1
- fi
-}
+pre="${0##*/}:"
+m() { printf "$pre %s\n" "$*"; "$@"; }
+e() { printf "$pre %s\n" "$*"; }
+err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
host=$1
host=$1
@@
-67,6
+65,7
@@
else
exit 1
fi
ip=$ip/32
exit 1
fi
ip=$ip/32
+ echo "$0: found ip of $host: $ip"
fi
if modprobe nfsd &>/dev/null; then
fi
if modprobe nfsd &>/dev/null; then
@@
-83,7
+82,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
+103,7
@@
fi
# man page doesn't explain this, but this deletes & thus disables
# all chboot systems.
# man page doesn't explain this, but this deletes & thus disables
# all chboot systems.
-
e
fai-chboot -iv $std_arg default # set it to default to get a val out of it next
+
m
fai-chboot -iv $std_arg default # set it to default to get a val out of it next
kernel=$(fai-chboot -L '^default$' | awk '{print $3}')
default_k_args=$(fai-chboot -L '^default$' | \
sed -r "s/^(\S+\s+){3}(.*)/\2/")
kernel=$(fai-chboot -L '^default$' | awk '{print $3}')
default_k_args=$(fai-chboot -L '^default$' | \
sed -r "s/^(\S+\s+){3}(.*)/\2/")
@@
-124,7
+123,7
@@
for arg in $default_k_args; do
esac
done
rm -f /srv/tftp/fai/pxelinux.cfg/*
esac
done
rm -f /srv/tftp/fai/pxelinux.cfg/*
-
e
fai-chboot -k "${k_args[*]}" -v -f verbose,sshd,createvt$fai_reboot_arg $std_arg $kernel "$host"
+
m
fai-chboot -k "${k_args[*]}" -v -f verbose,sshd,createvt$fai_reboot_arg $std_arg $kernel "$host"
# this is needed for autodiscover iso. i'm not sure, it might override
# the fai-chboot method of setting this, i'm not sure.
# this is needed for autodiscover iso. i'm not sure, it might override
# the fai-chboot method of setting this, i'm not sure.