diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-14 20:55:53 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-14 20:55:53 +0000 |
| commit | 1948707197e7ff10f90a1ec89884c055862c8f61 (patch) | |
| tree | 5b98aaa49d5b66b41fbeaf14f47d6ee2df896906 /usr.sbin/bsdconfig | |
| parent | 1277739e09fd46dcb4de3e9c9b0d47f278d281d3 (diff) | |
| download | FreeBSD-src-1948707197e7ff10f90a1ec89884c055862c8f61.zip FreeBSD-src-1948707197e7ff10f90a1ec89884c055862c8f61.tar.gz | |
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
Diffstat (limited to 'usr.sbin/bsdconfig')
| -rw-r--r-- | usr.sbin/bsdconfig/share/common.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr index dd8c534..db28a54 100644 --- a/usr.sbin/bsdconfig/share/common.subr +++ b/usr.sbin/bsdconfig/share/common.subr @@ -64,8 +64,8 @@ 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="$( - 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 |
