Module Name: src
Committed By: abs
Date: Sun Feb 12 19:27:21 UTC 2023
Modified Files:
src/distrib/evbarm/installimage: install.sh
src/distrib/sparc64/cdroms/installcd: install.sh
src/distrib/vax/cdroms/installcd: install.sh
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/installimage/install.sh
cvs rdiff -u -r1.4 -r1.5 src/distrib/sparc64/cdroms/installcd/install.sh
cvs rdiff -u -r1.2 -r1.3 src/distrib/vax/cdroms/installcd/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/installimage/install.sh
diff -u src/distrib/evbarm/installimage/install.sh:1.1 src/distrib/evbarm/installimage/install.sh:1.2
--- src/distrib/evbarm/installimage/install.sh:1.1 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/install.sh Sun Feb 12 19:27:20 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.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
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.5
--- src/distrib/sparc64/cdroms/installcd/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/sparc64/cdroms/installcd/install.sh Sun Feb 12 19:27:20 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.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
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.3
--- src/distrib/vax/cdroms/installcd/install.sh:1.2 Thu May 28 09:51:31 2015
+++ src/distrib/vax/cdroms/installcd/install.sh Sun Feb 12 19:27:20 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.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
