trap transitory exit with debug shell
This commit is contained in:
parent
f9edb94065
commit
aa951dec01
15
install.sh
15
install.sh
|
@ -334,11 +334,11 @@ EOF
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
error_occurred() {
|
installer_error_occurred() {
|
||||||
log "Error occurred. Exiting."
|
log "Error occurred. Exiting."
|
||||||
}
|
}
|
||||||
|
|
||||||
exit_cleanup() {
|
installer_exit_cleanup() {
|
||||||
log "Cleaning up ..."
|
log "Cleaning up ..."
|
||||||
set +e
|
set +e
|
||||||
umount /archroot/dev/pts
|
umount /archroot/dev/pts
|
||||||
|
@ -364,8 +364,8 @@ installer_main() {
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
trap error_occurred ERR
|
trap installer_error_occurred ERR
|
||||||
trap exit_cleanup EXIT
|
trap installer_exit_cleanup EXIT
|
||||||
|
|
||||||
log "Ensuring correct permissions ..."
|
log "Ensuring correct permissions ..."
|
||||||
chmod 0700 "${script_path}"
|
chmod 0700 "${script_path}"
|
||||||
|
@ -394,8 +394,15 @@ installer_main() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
transitory_exit_occurred() {
|
||||||
|
# not normally called
|
||||||
|
log "Error occurred! You're on your own."
|
||||||
|
exec /bin/bash
|
||||||
|
}
|
||||||
|
|
||||||
transitory_main() {
|
transitory_main() {
|
||||||
|
|
||||||
|
trap transitory_exit_occurred EXIT
|
||||||
if [ "${script_path}" = "/sbin/init" ]; then
|
if [ "${script_path}" = "/sbin/init" ]; then
|
||||||
# save script
|
# save script
|
||||||
mount -o remount,rw /
|
mount -o remount,rw /
|
||||||
|
|
Loading…
Reference in New Issue