[src/netbsd-10]: src/usr.sbin/sysinst Pull up following revision(s) (requeste...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-10]: src/usr.sbin/sysinst Pull up following revision(s) (requeste...
From: martin <martin%NetBSD.org@localhost>
Date: Fri, 24 Feb 2023 17:25:10 +0000
details:   https://anonhg.NetBSD.org/src/rev/6c037ae61ebf
branches:  netbsd-10
changeset: 373690:6c037ae61ebf
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 24 13:48:27 2023 +0000

description:
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

diffstat:

 distrib/amd64/cdroms/install.sh             |  6 +++---
 distrib/amd64/installimage-bios/install.sh  |  6 +++---
 distrib/amd64/installimage/install.sh       |  6 +++---
 distrib/evbarm/installimage/install.sh      |  8 ++++----
 distrib/i386/cdroms/install.sh              |  6 +++---
 distrib/i386/installimage/install.sh        |  8 ++++----
 distrib/sparc64/cdroms/installcd/install.sh |  6 +++---
 distrib/vax/cdroms/installcd/install.sh     |  6 +++---
 usr.sbin/sysinst/menus.mi                   |  4 ++--
 9 files changed, 28 insertions(+), 28 deletions(-)

diffs (236 lines):

diff -r b1fe023663d9 -r 6c037ae61ebf distrib/amd64/cdroms/install.sh
--- a/distrib/amd64/cdroms/install.sh   Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/amd64/cdroms/install.sh   Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/amd64/installimage-bios/install.sh
--- a/distrib/amd64/installimage-bios/install.sh        Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/amd64/installimage-bios/install.sh        Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/amd64/installimage/install.sh
--- a/distrib/amd64/installimage/install.sh     Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/amd64/installimage/install.sh     Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/evbarm/installimage/install.sh
--- a/distrib/evbarm/installimage/install.sh    Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/evbarm/installimage/install.sh    Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do
@@ -100,7 +100,7 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/i386/cdroms/install.sh
--- a/distrib/i386/cdroms/install.sh    Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/i386/cdroms/install.sh    Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/i386/installimage/install.sh
--- a/distrib/i386/installimage/install.sh      Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/i386/installimage/install.sh      Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
 
 # run the installation or upgrade script.
 cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
 
 while [ -n "${cmd}" ]
 do
@@ -100,7 +100,7 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/sparc64/cdroms/installcd/install.sh
--- a/distrib/sparc64/cdroms/installcd/install.sh       Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/sparc64/cdroms/installcd/install.sh       Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf distrib/vax/cdroms/installcd/install.sh
--- a/distrib/vax/cdroms/installcd/install.sh   Fri Feb 24 13:42:05 2023 +0000
+++ b/distrib/vax/cdroms/installcd/install.sh   Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                        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 @@
 echo "TERM=${TERM}" > ${termfile}
 echo
 echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
diff -r b1fe023663d9 -r 6c037ae61ebf usr.sbin/sysinst/menus.mi
--- a/usr.sbin/sysinst/menus.mi Fri Feb 24 13:42:05 2023 +0000
+++ b/usr.sbin/sysinst/menus.mi Fri Feb 24 13:48:27 2023 +0000
@@ -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 @@
                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,
Prev by Date: [src/netbsd-10]: src/sys/net Pull up following revision(s) (requested by gutt...
Next by Date: [src/netbsd-10]: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu Pull up follow...
Previous by Thread: [src/netbsd-10]: src/sys/net Pull up following revision(s) (requested by gutt...
Next by Thread: [src/netbsd-10]: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu Pull up follow...
Indexes:
Home | Main Index | Thread Index | Old Index