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
minor fixes and updates
[automated-distro-installer]
/
install-chboot
diff --git
a/install-chboot
b/install-chboot
index 69f46dfb99848bbbdd6641a98ae15108d0df165a..acb6531f835a1888963070e41ea42215ae0309dc 100755
(executable)
--- a/
install-chboot
+++ b/
install-chboot
@@
-17,11
+17,8
@@
[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
-
-x=$(readlink -f "$BASH_SOURCE"); cd ${x%/*}
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+cd ${x%/*}
usage() {
cat <<EOF
usage() {
cat <<EOF
@@
-51,6
+48,7
@@
for dir in $mount_point/*; do
if [[ -e $dir/boot ]]; then
dir=$dir/boot
fi
if [[ -e $dir/boot ]]; then
dir=$dir/boot
fi
+ e install -m 755 -o root -g root bash-trace $dir
e install -m 755 -o root -g root chboot $dir
done
e umount $mount_point
e install -m 755 -o root -g root chboot $dir
done
e umount $mount_point