Author: gjb
Date: Sat Dec 14 20:55:53 2013
New Revision: 259396
URL: http://svnweb.freebsd.org/changeset/base/259396
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).
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.sbin/bsdconfig/share/common.subr
stable/10/usr.sbin/bsdinstall/bsdinstall
stable/10/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/share/common.subr Sat Dec 14 20:12:28
2013 (r259395)
+++ stable/10/usr.sbin/bsdconfig/share/common.subr Sat Dec 14 20:55:53
2013 (r259396)
@@ -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: stable/10/usr.sbin/bsdinstall/bsdinstall
==============================================================================
--- stable/10/usr.sbin/bsdinstall/bsdinstall Sat Dec 14 20:12:28 2013
(r259395)
+++ stable/10/usr.sbin/bsdinstall/bsdinstall Sat Dec 14 20:55:53 2013
(r259396)
@@ -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: stable/10/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/zfsboot Sat Dec 14 20:12:28
2013 (r259395)
+++ stable/10/usr.sbin/bsdinstall/scripts/zfsboot Sat Dec 14 20:55:53
2013 (r259396)
@@ -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" \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
