linuxrc: run the debug shell multiple times, add a hook before switch_root

cleanup-cruft
Fabio Erculiani 12 years ago
parent 9ead931af1
commit 108f1daf60

@ -1055,6 +1055,7 @@ rundebugshell() {
if [ -n "$DEBUG" ] if [ -n "$DEBUG" ]
then then
good_msg 'Starting debug shell as requested by "debug" option.' good_msg 'Starting debug shell as requested by "debug" option.'
good_msg "Stopping by: ${1}"
do_rundebugshell do_rundebugshell
fi fi
} }

@ -424,7 +424,7 @@ mkdir -p "${NEW_ROOT}"
CHROOT="${NEW_ROOT}" CHROOT="${NEW_ROOT}"
# Run debug shell if requested # Run debug shell if requested
rundebugshell rundebugshell "before setting up the root filesystem"
if [ "${CDROOT}" = '1' ] if [ "${CDROOT}" = '1' ]
then then
@ -937,6 +937,9 @@ then
bad_msg "ERROR: your real /dev is missing tty1, required for splash" bad_msg "ERROR: your real /dev is missing tty1, required for splash"
fi fi
# Run debug shell if requested
rundebugshell "before entering switch_root"
exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}" exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin/init}" "${INIT_OPTS}"
# If we get here, something bad has happened # If we get here, something bad has happened

Loading…
Cancel
Save