fix various arch issues

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 4d18ccb742dcad33e9d9691372a0e711e4ac4ef8..ec299e47b734a14cf56752247f439700305a299c 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -3,16 +3,20 @@
 # Setup dhcp server to point to tftp server,
 # and depending on the type, setup the tftp server.
 
-# usage: $0 [TYPE]
-# default distro is the base debian/fedora type. others are fai &  arch
+# usage: $0 TYPE
+# default distro is the base debian/fedora type. others are fai & arch.
+# for no pxe server, use a no-op like : or true.
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-action=${1:-default}
+if [[ ! $1 ]]; then
+    echo "$0: error: exptected 1 argument of type"
+fi
+action=$1
 
 arch() {
-    default
+    plain-tftp
     cat <<'EOF'
 dhcp-option-force=209,boot/syslinux/archiso.cfg
 dhcp-option-force=210,/arch/
@@ -20,7 +24,9 @@ dhcp-boot=/arch/boot/syslinux/lpxelinux.0
 EOF
 }
 
-default() {
+plain-tftp() {
+    # if arch was used before, this additionally needs
+    # the tftp link in /mnt/usb to be changed.
     cat <<'EOF'
 enable-tftp
 tftp-root=/mnt/usb/tftpboot