X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=debian-pxe-preseed;h=aaef9a617344827b13f8d22221dbbfd2bb0b01ca;hb=HEAD;hp=c2a2087cc683c4d441c48230199840a97593d2f1;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer

diff --git a/debian-pxe-preseed b/debian-pxe-preseed
index c2a2087..e2d401f 100755
--- a/debian-pxe-preseed
+++ b/debian-pxe-preseed
@@ -16,32 +16,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-cleanup() { :; }
-set -eE -o pipefail
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
+# WARNING: outdated! needs docs and update to debian-stretch
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
-src=$(readlink -f "${BASH_SOURCE%/*}")
+set -e; . /usr/local/lib/bash-bear; set +e
+
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
 
 e() { echo "$*"; "$@"; }
 
 mount_dir=$(mktemp -d)
 
-cleanup() { cd; umount -f $mount_dir; }
-e mount -o users wrt:/mnt/usb $mount_dir
+err-cleanup() { cd; umount -f $mount_dir; }
+e mount -o users cmc:/mnt/usb $mount_dir
 
 
 cd $mount_dir
 e rm -rf debian-wheezy
 mkdir debian-wheezy
 cd debian-wheezy
-e $src/debian-preseed "$@" # my script
+e $this_dir/debian-preseed "$@" # my script
 cd ..
 e rm -f tftpboot
 e ln -s debian-wheezy tftpboot
 
 cd /
 e umount $mount_dir
-e $src/pxe-server default plain # my script
+e $this_dir/pxe-server default plain # my script