Enable basic command line editing in evbarm, sparc64 and vax installer shells
(Following the pattern in amd64) When a user selects "exit installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) With the change of all the install.sh scripts in amd64, evbarm, i386, sparc64 and vax are identical apart from NetBSD RCD tags and the sysctl -nx kern.consdev check (some of the latter are definitely either wrong, or have an incorrect comment attached. Will return to later)
This commit is contained in:
parent
1f318b35b6
commit
62fe57d219
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh -m
|
||||
# $NetBSD: install.sh,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
|
||||
# $NetBSD: install.sh,v 1.2 2023/02/12 19:27:20 abs Exp $
|
||||
#
|
||||
# -
|
||||
# Copyright (c) 2010 The NetBSD Foundation, Inc.
|
||||
|
@ -87,7 +87,7 @@ fi
|
|||
|
||||
# run the installation or upgrade script.
|
||||
cd /
|
||||
cmd=./sysinst
|
||||
cmd=/usr/sbin/sysinst
|
||||
|
||||
while [ -n "${cmd}" ]
|
||||
do
|
||||
|
@ -100,7 +100,7 @@ do
|
|||
tput clear
|
||||
echo "You have stopped sysinst, return to it by" \
|
||||
"typing 'exit' or ^D."
|
||||
${SHELL} -i
|
||||
${SHELL} -i -E
|
||||
cmd="fg"
|
||||
else
|
||||
cmd=""
|
||||
|
@ -112,4 +112,4 @@ done
|
|||
echo "TERM=${TERM}" > ${termfile}
|
||||
echo
|
||||
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
|
||||
exec ${SHELL}
|
||||
exec ${SHELL} -E
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh -m
|
||||
# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $
|
||||
# $NetBSD: install.sh,v 1.5 2023/02/12 19:27:20 abs Exp $
|
||||
#
|
||||
# -
|
||||
# Copyright (c) 2010 The NetBSD Foundation, Inc.
|
||||
|
@ -100,7 +100,7 @@ do
|
|||
tput clear
|
||||
echo "You have stopped sysinst, return to it by" \
|
||||
"typing 'exit' or ^D."
|
||||
${SHELL} -i
|
||||
${SHELL} -i -E
|
||||
cmd="fg"
|
||||
else
|
||||
cmd=""
|
||||
|
@ -112,4 +112,4 @@ done
|
|||
echo "TERM=${TERM}" > ${termfile}
|
||||
echo
|
||||
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
|
||||
exec ${SHELL}
|
||||
exec ${SHELL} -E
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh -m
|
||||
# $NetBSD: install.sh,v 1.2 2015/05/28 09:51:31 martin Exp $
|
||||
# $NetBSD: install.sh,v 1.3 2023/02/12 19:27:20 abs Exp $
|
||||
#
|
||||
# -
|
||||
# Copyright (c) 2010 The NetBSD Foundation, Inc.
|
||||
|
@ -100,7 +100,7 @@ do
|
|||
tput clear
|
||||
echo "You have stopped sysinst, return to it by" \
|
||||
"typing 'exit' or ^D."
|
||||
${SHELL} -i
|
||||
${SHELL} -i -E
|
||||
cmd="fg"
|
||||
else
|
||||
cmd=""
|
||||
|
@ -112,4 +112,4 @@ done
|
|||
echo "TERM=${TERM}" > ${termfile}
|
||||
echo
|
||||
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
|
||||
exec ${SHELL}
|
||||
exec ${SHELL} -E
|
||||
|
|
Loading…
Reference in New Issue