X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;h=17dfba3db75bfe8d3799620a3ebf23a4703733ff;hb=6e825b2a2dcb8dad97fc4696ba26c4dcf4a05cb9;hp=28e71e370dacc61542200f8ceac48c55c7a27797;hpb=c47175685b348735b3440e16851dde2cc39b6f3f;p=automated-distro-installer diff --git a/faiserver-setup b/faiserver-setup index 28e71e3..17dfba3 100755 --- a/faiserver-setup +++ b/faiserver-setup @@ -17,21 +17,22 @@ x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace" -[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@" +[[ $EUID == 0 ]] || exec sudo -i "${BASH_SOURCE}" "$@" usage() { cat </dev/null; then apt-get install -y wget fi @@ -83,16 +89,25 @@ 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 https://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 # tends to have less bugs. 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 + case $base in + stretch) + cat >/etc/apt/sources.list.d/fai.list <<'EOF' +deb https://fai-project.org/download stretch koeln +EOF + ;; + buster) + cat >/etc/apt/sources.list.d/fai.list <<'EOF' +deb https://fai-project.org/download buster koeln EOF + ;; + esac else rm -f /etc/apt/sources.list.d/fai.list fi @@ -129,7 +144,7 @@ EOF case $base in - jessie|stretch) + jessie|stretch|buster) cat >>/etc/fai/apt/sources.list <