Date: Mon, 11 Nov 2013 01:42:59 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257937 - head/usr.sbin/bsdconfig/share Message-ID: <201311110142.rAB1gxLO072806@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311110142.rAB1gxLO072806>