iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ccaac3
)
fatal fixes to faiserver setup
author
Ian Kelling
<iank@fsf.org>
Mon, 3 Sep 2018 00:23:35 +0000
(20:23 -0400)
committer
Ian Kelling
<iank@fsf.org>
Mon, 3 Sep 2018 00:23:35 +0000
(20:23 -0400)
faiserver-setup
patch
|
blob
|
history
diff --git
a/faiserver-setup
b/faiserver-setup
index b9fe68f037cf7c6f5e8821e3d61e0106289de7a3..2348db02a4c08d26cc2c84c3e95edd44bb0cff72 100755
(executable)
--- a/
faiserver-setup
+++ b/
faiserver-setup
@@
-17,7
+17,7
@@
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+[[ $EUID == 0 ]] || exec sudo
-i
"${BASH_SOURCE}" "$@"
usage() {
cat <<EOF
usage() {
cat <<EOF
@@
-48,6
+48,12
@@
e() { echo "$@"; "$@"; }
base=stretch
sed="sed -ri --follow-symlinks"
base=stretch
sed="sed -ri --follow-symlinks"
+if [[ ! -e $BASEFILE_DIR/STRETCH64.tar.gz ]]; then
+ printf "%s\n" "$0: error BASEFILE_DIR=$BASEFILE_DIR \$BASEFILE_DIR/STRETCH64.tar.gz does not exist"
+ exit 1
+fi
+
+
if ! type -p wget &>/dev/null; then
apt-get install -y wget
fi
if ! type -p wget &>/dev/null; then
apt-get install -y wget
fi
@@
-82,7
+88,7
@@
EOF
elif grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
gpg -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
cat >/etc/apt/sources.list.d/fai.list <<'EOF'
elif grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
gpg -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
cat >/etc/apt/sources.list.d/fai.list <<'EOF'
-deb http://fai-project.org/download jessie koeln
+deb http
s
://fai-project.org/download jessie koeln
EOF
elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenail' /etc/os-release ; then
# fai on ubuntu only has official support using the universe repo, but newer
EOF
elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenail' /etc/os-release ; then
# fai on ubuntu only has official support using the universe repo, but newer
@@
-90,7
+96,7
@@
elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenai
gpg --keyserver hkp://pool.sks-keyservers.net -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
cat >/etc/apt/sources.list.d/fai.list <<'EOF'
gpg --keyserver hkp://pool.sks-keyservers.net -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
cat >/etc/apt/sources.list.d/fai.list <<'EOF'
-deb http://fai-project.org/download stretch koeln
+deb http
s
://fai-project.org/download stretch koeln
EOF
else
rm -f /etc/apt/sources.list.d/fai.list
EOF
else
rm -f /etc/apt/sources.list.d/fai.list