From owner-svn-src-all@freebsd.org  Thu Aug 10 13:32:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17A48DD2CC4;
 Thu, 10 Aug 2017 13:32:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D66C3E20;
 Thu, 10 Aug 2017 13:32:05 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7ADW5iS008389;
 Thu, 10 Aug 2017 13:32:05 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ADW52T008388;
 Thu, 10 Aug 2017 13:32:05 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201708101332.v7ADW52T008388@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 10 Aug 2017 13:32:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322358 - head/release/packages
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release/packages
X-SVN-Commit-Revision: 322358
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Aug 2017 13:32:06 -0000

Author: gjb
Date: Thu Aug 10 13:32:04 2017
New Revision: 322358
URL: https://svnweb.freebsd.org/changeset/base/322358

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

Modified:
  head/release/packages/kernel.ucl

Modified: head/release/packages/kernel.ucl
==============================================================================
--- head/release/packages/kernel.ucl	Thu Aug 10 13:05:40 2017	(r322357)
+++ head/release/packages/kernel.ucl	Thu Aug 10 13:32:04 2017	(r322358)
@@ -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