Module Name: src
Committed By: martin
Date: Fri Feb 24 13:48:28 UTC 2023
Modified Files:
src/distrib/amd64/cdroms [netbsd-10]: install.sh
src/distrib/amd64/installimage [netbsd-10]: install.sh
src/distrib/amd64/installimage-bios [netbsd-10]: install.sh
src/distrib/evbarm/installimage [netbsd-10]: install.sh
src/distrib/i386/cdroms [netbsd-10]: install.sh
src/distrib/i386/installimage [netbsd-10]: install.sh
src/distrib/sparc64/cdroms/installcd [netbsd-10]: install.sh
src/distrib/vax/cdroms/installcd [netbsd-10]: install.sh
src/usr.sbin/sysinst [netbsd-10]: menus.mi
Log Message:
Pull up following revision(s) (requested by abs in ticket #105):
distrib/amd64/installimage-bios/install.sh: revision 1.3
distrib/i386/cdroms/install.sh: revision 1.5
distrib/vax/cdroms/installcd/install.sh: revision 1.3
distrib/amd64/cdroms/install.sh: revision 1.5
distrib/sparc64/cdroms/installcd/install.sh: revision 1.5
distrib/i386/installimage/install.sh: revision 1.3
distrib/i386/installimage/install.sh: revision 1.4
distrib/evbarm/installimage/install.sh: revision 1.2
distrib/amd64/installimage/install.sh: revision 1.4
usr.sbin/sysinst/menus.mi: revision 1.28
Enable basic command line editing in amd64 installer shells
When a user selects "exist 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)
At this point this is only on amd64, as this is the port which is
least likely to be installing on particularly esoteric terminal
hardware, and is also likely to have the highest proportion of less
experienced users
Enable basic command line editing in i386 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)
Switch install.sh to use /usr/sbin/sysinst for sysinst rather than ./sysinst
Matches i386/cdroms/install.sh and amd64/installimage/install.sh
resultant install image verified to still run sysinst correctly
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)
Add "-i -E" to /bin/sh called from sysinst
This enables command line editing (primarily for arrow keys, but basic
emacs sequences will also work)
In the event that the shell has been compiled without command line
editing features (for memory contrained install environments) the
-E is ignored
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.26.1 src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.3 -r1.3.2.1 src/distrib/amd64/installimage/install.sh
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/amd64/installimage-bios/install.sh
cvs rdiff -u -r1.1 -r1.1.6.1 src/distrib/evbarm/installimage/install.sh
cvs rdiff -u -r1.4 -r1.4.26.1 src/distrib/i386/cdroms/install.sh
cvs rdiff -u -r1.2 -r1.2.44.1 src/distrib/i386/installimage/install.sh
cvs rdiff -u -r1.4 -r1.4.26.1 src/distrib/sparc64/cdroms/installcd/install.sh
cvs rdiff -u -r1.2 -r1.2.26.1 src/distrib/vax/cdroms/installcd/install.sh
cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/sysinst/menus.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/install.sh
diff -u src/distrib/amd64/cdroms/install.sh:1.4 src/distrib/amd64/cdroms/install.sh:1.4.26.1
--- src/distrib/amd64/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/amd64/cdroms/install.sh Fri Feb 24 13:48:27 2023
@@ -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.4.26.1 2023/02/24 13:48:27 martin 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
Index: src/distrib/amd64/installimage/install.sh
diff -u src/distrib/amd64/installimage/install.sh:1.3 src/distrib/amd64/installimage/install.sh:1.3.2.1
--- src/distrib/amd64/installimage/install.sh:1.3 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/install.sh Fri Feb 24 13:48:28 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: install.sh,v 1.3.2.1 2023/02/24 13:48:28 martin 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
Index: src/distrib/amd64/installimage-bios/install.sh
diff -u src/distrib/amd64/installimage-bios/install.sh:1.2 src/distrib/amd64/installimage-bios/install.sh:1.2.2.1
--- src/distrib/amd64/installimage-bios/install.sh:1.2 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/install.sh Fri Feb 24 13:48:27 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.2 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: install.sh,v 1.2.2.1 2023/02/24 13:48:27 martin 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
Index: src/distrib/evbarm/installimage/install.sh
diff -u src/distrib/evbarm/installimage/install.sh:1.1 src/distrib/evbarm/installimage/install.sh:1.1.6.1
--- src/distrib/evbarm/installimage/install.sh:1.1 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/install.sh Fri Feb 24 13:48:28 2023
@@ -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.1.6.1 2023/02/24 13:48:28 martin 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
Index: src/distrib/i386/cdroms/install.sh
diff -u src/distrib/i386/cdroms/install.sh:1.4 src/distrib/i386/cdroms/install.sh:1.4.26.1
--- src/distrib/i386/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/i386/cdroms/install.sh Fri Feb 24 13:48:27 2023
@@ -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.4.26.1 2023/02/24 13:48:27 martin 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
Index: src/distrib/i386/installimage/install.sh
diff -u src/distrib/i386/installimage/install.sh:1.2 src/distrib/i386/installimage/install.sh:1.2.44.1
--- src/distrib/i386/installimage/install.sh:1.2 Sun Jun 3 21:42:45 2012
+++ src/distrib/i386/installimage/install.sh Fri Feb 24 13:48:28 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.2.44.1 2023/02/24 13:48:28 martin 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
Index: src/distrib/sparc64/cdroms/installcd/install.sh
diff -u src/distrib/sparc64/cdroms/installcd/install.sh:1.4 src/distrib/sparc64/cdroms/installcd/install.sh:1.4.26.1
--- src/distrib/sparc64/cdroms/installcd/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/sparc64/cdroms/installcd/install.sh Fri Feb 24 13:48:28 2023
@@ -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.4.26.1 2023/02/24 13:48:28 martin 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
Index: src/distrib/vax/cdroms/installcd/install.sh
diff -u src/distrib/vax/cdroms/installcd/install.sh:1.2 src/distrib/vax/cdroms/installcd/install.sh:1.2.26.1
--- src/distrib/vax/cdroms/installcd/install.sh:1.2 Thu May 28 09:51:31 2015
+++ src/distrib/vax/cdroms/installcd/install.sh Fri Feb 24 13:48:27 2023
@@ -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.2.26.1 2023/02/24 13:48:27 martin 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
Index: src/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.27 src/usr.sbin/sysinst/menus.mi:1.27.2.1
--- src/usr.sbin/sysinst/menus.mi:1.27 Fri Jul 22 16:51:14 2022
+++ src/usr.sbin/sysinst/menus.mi Fri Feb 24 13:48:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.27 2022/07/22 16:51:14 christos Exp $ */
+/* $NetBSD: menus.mi,v 1.27.2.1 2023/02/24 13:48:28 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -270,7 +270,7 @@ menu utility, title MSG_NetBSD_VERSION_U
exitstring MSG_exit_menu_generic;
display action { toplevel(); };
option MSG_Run_bin_sh,
- action (endwin) { system("/bin/sh"); };
+ action (endwin) { system("/bin/sh -i -E"); };
option MSG_Set_timezone,
action { set_timezone(); };
option MSG_Configure_network,
