summaryrefslogtreecommitdiff
path: root/release/packages
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-08-10 13:32:04 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-08-10 13:32:04 +0000
commit268db560d58918e5287f01aa929a9e26a275ce05 (patch)
tree301750f0665016d6504ada5ab6637a88434c8889 /release/packages
parentf6800be3ce6cfc0f141aa19d76279017fa43a2ea (diff)
downloadsrc-test-268db560d58918e5287f01aa929a9e26a275ce05.tar.gz
src-test-268db560d58918e5287f01aa929a9e26a275ce05.zip
Further revise r322327 and r322352 in release/packages/kernel.ucl.
Use PPID and PID to kill off the pre-install and parent pkg(8) processes unless 'Y' or 'y' are entered at the prompt if the user wants to proceed with upgrading the kernel and userland at the same time. This restores some of the logic and intent of r322327, with the caveat of printing "child process terminated unexpectedly." MFC after: 5 days MFC with: r322327, r322352 Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=322358
Diffstat (limited to 'release/packages')
-rw-r--r--release/packages/kernel.ucl12
1 files changed, 11 insertions, 1 deletions
diff --git a/release/packages/kernel.ucl b/release/packages/kernel.ucl
index 4edf5657ffd33..487e03456d21d 100644
--- a/release/packages/kernel.ucl
+++ b/release/packages/kernel.ucl
@@ -40,7 +40,17 @@ scripts: {
echo " pkg upgrade"
echo
echo "****************************************************************"
- sleep 5
+ echo
+ echo "Do you want to continue anyway? (N/y)"
+ read ANSWER
+ case ${ANSWER} in
+ [Yy])
+ exit 0
+ ;;
+ *)
+ kill ${PPID} ${PID}
+ ;;
+ esac
EOD
post-install = <<EOD