From owner-svn-src-releng@FreeBSD.ORG Sun Dec 15 03:20:02 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6432E557; Sun, 15 Dec 2013 03:20:02 +0000 (UTC) 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 49D46130A; Sun, 15 Dec 2013 03:20:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF3K29T098175; Sun, 15 Dec 2013 03:20:02 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF3K1Lg098153; Sun, 15 Dec 2013 03:20:01 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312150320.rBF3K1Lg098153@svn.freebsd.org> From: Glen Barber Date: Sun, 15 Dec 2013 03:20:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259402 - in releng/10.0/usr.sbin: bsdconfig/share bsdinstall bsdinstall/scripts X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 03:20:02 -0000 Author: gjb Date: Sun Dec 15 03:20:01 2013 New Revision: 259402 URL: http://svnweb.freebsd.org/changeset/base/259402 Log: MFC r259113, r259115, r259144, r259148: r259113 (dteske): Fix failed attempt to send pkg(8) stderr to /dev/null r259115 (dteske): Prevent truncating /tmp/bsdinstall_log each time we exec a module. r259144 (dteske): Fix a regression after successfully installing to encrypted ZFS root, the passphrase is not accepted and a message about "incorrect key" is displayed. r259148 (dteske): Fix a regression resulting in mountroot prompt after attempting to install to encrypted ZFS root (caused by a typo in a variable name -- ZFSBOOT_BOOT_FSNAME -> ZFSBOOT_BOOTFS_NAME). Approved by: re (glebius) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/usr.sbin/bsdconfig/share/common.subr releng/10.0/usr.sbin/bsdinstall/bsdinstall releng/10.0/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/usr.sbin/bsdconfig/share/common.subr ============================================================================== --- releng/10.0/usr.sbin/bsdconfig/share/common.subr Sat Dec 14 22:43:30 2013 (r259401) +++ releng/10.0/usr.sbin/bsdconfig/share/common.subr Sun Dec 15 03:20:01 2013 (r259402) @@ -64,8 +64,8 @@ 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="$( - ASSUME_ALWAYS_YES=1 pkg -vv | - awk '$1=="ABI"{print $3;exit}' 2> /dev/null + ASSUME_ALWAYS_YES=1 pkg -vv 2> /dev/null | + awk '$1=="ABI"{print $3;exit}' )" fi Modified: releng/10.0/usr.sbin/bsdinstall/bsdinstall ============================================================================== --- releng/10.0/usr.sbin/bsdinstall/bsdinstall Sat Dec 14 22:43:30 2013 (r259401) +++ releng/10.0/usr.sbin/bsdinstall/bsdinstall Sun Dec 15 03:20:01 2013 (r259402) @@ -33,6 +33,7 @@ # re-processing of flags (all children log to the parent's log file). # export DEBUG_SELF_INITIALIZE= +export DEBUG_INITIALIZE_FILE= BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 Modified: releng/10.0/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- releng/10.0/usr.sbin/bsdinstall/scripts/zfsboot Sat Dec 14 22:43:30 2013 (r259401) +++ releng/10.0/usr.sbin/bsdinstall/scripts/zfsboot Sun Dec 15 03:20:01 2013 (r259402) @@ -1190,7 +1190,7 @@ zfs_create_boot() f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \ \$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" vfs.root.mountfrom \ - '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOT_FSNAME"' \ + '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"' \ \$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE f_dprintf "$funcname: disks=[%s]" "$disks" for disk in $disks; do @@ -1203,7 +1203,7 @@ zfs_create_boot() return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" \ geli_%s_keyfile0_type \ - '"$disk$targetpart" "$disk$targetpart"' \ + '"$disk$targetpart" "$disk$targetpart:geli_keyfile0"' \ \$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart || return $FAILURE f_eval_catch $funcname printf "$PRINTF_CONF" \