bug fix

[automated-distro-installer] / debian-pxe-preseed

diff --git a/debian-pxe-preseed b/debian-pxe-preseed
index a3ed886b51655afc6e1c892d76a54d317d6e4090..e2d401fb50a183a520f47d883fa8cf4ae8b537ef 100755 (executable)
--- a/debian-pxe-preseed
+++ b/debian-pxe-preseed
@@ -18,30 +18,30 @@
 
 # WARNING: outdated! needs docs and update to debian-stretch
 
 
 # WARNING: outdated! needs docs and update to debian-stretch
 

-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-

 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 [[ $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)
 
 
 e() { echo "$*"; "$@"; }
 
 mount_dir=$(mktemp -d)
 

-cleanup() { cd; umount -f $mount_dir; }
-_errcatch_cleanup=cleanup
-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
 
 
 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
 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