aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Brekke <ahrain@ahrain.net>2016-03-18 22:48:01 +0100
committerGlenn Brekke <ahrain@ahrain.net>2016-03-18 22:48:01 +0100
commit54a5afbec8c2abb68d5f05539dbc3b7b89cca0d4 (patch)
tree60dedba00ac5fe04647ad13bc34340ea3d1983df
parent8fb5b7047179444b4e08a60b78fa6ad2bcb1cd77 (diff)
Small changes in various bootstrap scripts
-rwxr-xr-xbootstrap/fetch-debinstall.sh4
-rwxr-xr-xbootstrap/install-dependencies.sh5
-rwxr-xr-xbootstrap/make-pxeboot.sh6
3 files changed, 11 insertions, 4 deletions
diff --git a/bootstrap/fetch-debinstall.sh b/bootstrap/fetch-debinstall.sh
index 069e39a..017b864 100755
--- a/bootstrap/fetch-debinstall.sh
+++ b/bootstrap/fetch-debinstall.sh
@@ -2,8 +2,8 @@
INSTALLER_DEST=$1
DEBINSTROOT=http://ftp.no.debian.org/debian/dists
-mkdir -p ${INSTALLER_DEST}/{squeeze,wheezy}/{amd64,i386}
-for DIST in squeeze wheezy
+mkdir -p ${INSTALLER_DEST}/{wheezy,jessie}/{amd64,i386}
+for DIST in wheezy jessie
do
for ARCH in i386 amd64;
do
diff --git a/bootstrap/install-dependencies.sh b/bootstrap/install-dependencies.sh
index 3941858..c10224f 100755
--- a/bootstrap/install-dependencies.sh
+++ b/bootstrap/install-dependencies.sh
@@ -8,8 +8,13 @@ fi
# OK, we know the content of $0 is OK. I prefer sane names.
ROLE=$1;
+# Resynchronize the package index before install
+
+apt-get -y update
+
# Start by installing common packages. Remember to update
# this when a new common dependency is discovered, plx.
+
apt-get -y install \
vim-nox \
git \
diff --git a/bootstrap/make-pxeboot.sh b/bootstrap/make-pxeboot.sh
index 9492ad4..4ee0063 100755
--- a/bootstrap/make-pxeboot.sh
+++ b/bootstrap/make-pxeboot.sh
@@ -17,8 +17,6 @@ TFTP_ADDRESS=":69"
TFTP_OPTIONS="--secure"
END
-/etc/init.d/tftpd-hpa restart
-
mkdir -p /var/lib/tftpboot
cd ~/tgmanage
@@ -31,3 +29,7 @@ bootstrap/fetch-debinstall.sh /var/lib/tftpboot/debian
# NOTE! The pxe/ directory contains an 'ubuntu' menu...
# The files required to booting Ubuntu installer or live
# must be fetched manually (for now)
+
+# Restart tftpd-hpa.service
+systemctl restart tftpd-hpa.service
+