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.
This commit is contained in:
Glen Barber 2013-11-11 01:42:59 +00:00
parent 18b44c2d73
commit 6e12e3646d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=257937

View File

@ -64,6 +64,7 @@ export UNAME_M="$(uname -m)" # Machine platform (i.e. i386)
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