Module Name: src
Committed By: abs
Date: Sat Feb 11 17:52:19 UTC 2023
Modified Files:
src/distrib/i386/cdroms: install.sh
src/distrib/i386/installimage: install.sh
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/install.sh
cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/installimage/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/i386/cdroms/install.sh
diff -u src/distrib/i386/cdroms/install.sh:1.4 src/distrib/i386/cdroms/install.sh:1.5
--- src/distrib/i386/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/i386/cdroms/install.sh Sat Feb 11 17:52:19 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/11 17:52:19 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/i386/installimage/install.sh
diff -u src/distrib/i386/installimage/install.sh:1.2 src/distrib/i386/installimage/install.sh:1.3
--- src/distrib/i386/installimage/install.sh:1.2 Sun Jun 3 21:42:45 2012
+++ src/distrib/i386/installimage/install.sh Sat Feb 11 17:52:19 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.3 2023/02/11 17:52:19 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
