X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=debian-pxe-preseed;h=094294a4495ed58bb87a07dad1137d94d3a8cc3e;hp=bac251aba7349305c1b52f2c09abe4ab50298d39;hb=HEAD;hpb=78a1427fc167ccee73d448054a9c40c19d737ed3

diff --git a/debian-pxe-preseed b/debian-pxe-preseed
index bac251a..e2d401f 100755
--- a/debian-pxe-preseed
+++ b/debian-pxe-preseed
@@ -18,29 +18,30 @@
 
 # WARNING: outdated! needs docs and update to debian-stretch
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-
 [[ $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)
 
-errcatch-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