iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improvements
[automated-distro-installer]
/
debian-pxe-preseed
diff --git
a/debian-pxe-preseed
b/debian-pxe-preseed
index 31a038a052a59a969f84e9deda6a406b3f0037a2..e2d401fb50a183a520f47d883fa8cf4ae8b537ef 100755
(executable)
--- a/
debian-pxe-preseed
+++ b/
debian-pxe-preseed
@@
-16,30
+16,32
@@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+# WARNING: outdated! needs docs and update to debian-stretch
[[ $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