Module Name: src
Committed By: abs
Date: Mon Jan 16 15:00:03 UTC 2023
Modified Files:
src/distrib/amd64/cdroms: install.sh
src/distrib/amd64/installimage: install.sh
src/distrib/amd64/installimage-bios: install.sh
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/install.sh
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/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/amd64/cdroms/install.sh
diff -u src/distrib/amd64/cdroms/install.sh:1.4 src/distrib/amd64/cdroms/install.sh:1.5
--- src/distrib/amd64/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/amd64/cdroms/install.sh Mon Jan 16 15:00:03 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/01/16 15:00:03 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/amd64/installimage/install.sh
diff -u src/distrib/amd64/installimage/install.sh:1.3 src/distrib/amd64/installimage/install.sh:1.4
--- src/distrib/amd64/installimage/install.sh:1.3 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/install.sh Mon Jan 16 15:00:03 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.4 2023/01/16 15:00:03 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/amd64/installimage-bios/install.sh
diff -u src/distrib/amd64/installimage-bios/install.sh:1.2 src/distrib/amd64/installimage-bios/install.sh:1.3
--- src/distrib/amd64/installimage-bios/install.sh:1.2 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/install.sh Mon Jan 16 15:00:03 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.3 2023/01/16 15:00:03 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
