From owner-svn-src-all@FreeBSD.ORG Mon Nov 11 01:42:59 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D14F61D4; Mon, 11 Nov 2013 01:42:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF815205E; Mon, 11 Nov 2013 01:42:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB1gxew072807; Mon, 11 Nov 2013 01:42:59 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB1gxLO072806; Mon, 11 Nov 2013 01:42:59 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311110142.rAB1gxLO072806@svn.freebsd.org> From: Glen Barber Date: Mon, 11 Nov 2013 01:42:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257937 - head/usr.sbin/bsdconfig/share X-SVN-Group: head 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.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 01:42:59 -0000 Author: gjb Date: Mon Nov 11 01:42:59 2013 New Revision: 257937 URL: http://svnweb.freebsd.org/changeset/base/257937 Log: Unbreak the installer on head/: When bsdinstall(8) sources the bsdconfig(8) common.subr file, PKG_ABI is set by calling 'pkg -vv' and searching for the ABI pkg(8) will use. When pkg(8) is run for the first time, the bootstrap process is run, which prompts for 'y/N' input from stdin if running with TERM set. Since TERM is set and it is the first time pkg(8) is run, which happens automatically, bsdinstall(8) hangs waiting for user input which is never displayed since a specific line is expected by awk(1), and stdin is expected by pkg(8). Set ASSUME_ALWAYS_YES=1, which will cause pkg(8) to assume the '-y' flag is also used for the bootstrap process, allowing bsdinstall(8) to proceed to the keymap lookup, otherwise bsdinstall(8) appears to hang after selecting 'Install' from the menu on first boot from CDROM. Modified: head/usr.sbin/bsdconfig/share/common.subr Modified: head/usr.sbin/bsdconfig/share/common.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/common.subr Mon Nov 11 01:14:58 2013 (r257936) +++ head/usr.sbin/bsdconfig/share/common.subr Mon Nov 11 01:42:59 2013 (r257937) @@ -64,6 +64,7 @@ export UNAME_M="$(uname -m)" # Machine p export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE) if [ ! "${PKG_ABI+set}" ]; then export PKG_ABI="$( + env ASSUME_ALWAYS_YES=1 \ pkg -vv | awk '$1=="ABI:"{print $2;exit}' 2> /dev/null )" fi