From owner-svn-ports-all@freebsd.org Thu Jan 18 21:12:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38295EC3773; Thu, 18 Jan 2018 21:12:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1267681424; Thu, 18 Jan 2018 21:12:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FE9A23F0A; Thu, 18 Jan 2018 21:12:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0ILCUCK001753; Thu, 18 Jan 2018 21:12:30 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0ILCTsD001750; Thu, 18 Jan 2018 21:12:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201801182112.w0ILCTsD001750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 18 Jan 2018 21:12:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459380 - in head/sysutils/beadm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/sysutils/beadm: . files X-SVN-Commit-Revision: 459380 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2018 21:12:31 -0000 Author: bdrewery Date: Thu Jan 18 21:12:29 2018 New Revision: 459380 URL: https://svnweb.freebsd.org/changeset/ports/459380 Log: - Properly support selecting BE from boot menu. This is only supported for releases that have /etc/rc.d/zfsbe, which is 10.4, 11.1, and newer. PR: 208601 Reported by: many Reviewed by: allanjude Modified: head/sysutils/beadm/Makefile head/sysutils/beadm/files/patch-beadm head/sysutils/beadm/files/patch-beadm.1 Modified: head/sysutils/beadm/Makefile ============================================================================== --- head/sysutils/beadm/Makefile Thu Jan 18 21:08:02 2018 (r459379) +++ head/sysutils/beadm/Makefile Thu Jan 18 21:12:29 2018 (r459380) @@ -2,7 +2,7 @@ PORTNAME= beadm PORTVERSION= 1.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/sysutils/beadm/files/patch-beadm ============================================================================== --- head/sysutils/beadm/files/patch-beadm Thu Jan 18 21:08:02 2018 (r459379) +++ head/sysutils/beadm/files/patch-beadm Thu Jan 18 21:12:29 2018 (r459380) @@ -1,5 +1,5 @@ ---- beadm.orig 2017-01-13 15:25:44.000000000 -0800 -+++ beadm 2017-07-08 09:45:40.962588000 -0700 +--- beadm.orig 2017-01-13 23:25:44 UTC ++++ beadm @@ -128,6 +128,24 @@ __be_new() { # 1=SOURCE 2=TARGET unset NAME_NEW unset NAME_SANITY @@ -88,3 +88,39 @@ USED = __normalize($2) USEDBYDATASET = __normalize($3) USEDBYSNAPSHOTS = __normalize($4) +@@ -492,6 +540,7 @@ case ${1} in + fi + fi + # do not change root (/) mounted boot environment mountpoint ++ HAVE_ZFSBE=0 + if [ "${ROOTFS}" != "${POOL}/${BEDS}/${2}" ] + then + TMPMNT=$( mktemp -d -t BE-${2} ) +@@ -519,6 +568,9 @@ EOF + else + TMPMNT=${MOUNT} + fi ++ if [ -f ${TMPMNT}/etc/rc.d/zfsbe ]; then ++ HAVE_ZFSBE=1 ++ fi + if [ -f /boot/zfs/zpool.cache ] + then + cp /boot/zfs/zpool.cache ${TMPMNT}/boot/zfs/zpool.cache +@@ -555,11 +607,16 @@ EOF + zfs set canmount=noauto ${NAME} + done + # enable automatic mount for active boot environment and promote it ++ if [ ${HAVE_ZFSBE} -eq 1 ]; then ++ ZFSBE_CANMOUNT=noauto ++ else ++ ZFSBE_CANMOUNT=on ++ fi + echo "${ZFS_LIST}" \ + | grep -E "^${POOL}/${BEDS}/${2}(/|$)" \ + | while read NAME + do +- zfs set canmount=on ${NAME} ++ zfs set canmount=${ZFSBE_CANMOUNT} ${NAME} + while __be_clone ${NAME} + do + zfs promote ${NAME} Modified: head/sysutils/beadm/files/patch-beadm.1 ============================================================================== --- head/sysutils/beadm/files/patch-beadm.1 Thu Jan 18 21:08:02 2018 (r459379) +++ head/sysutils/beadm/files/patch-beadm.1 Thu Jan 18 21:12:29 2018 (r459380) @@ -4,11 +4,9 @@ Date: Wed Sep 6 09:17:00 2017 -0600 Fix indentation in man page -diff --git beadm.1 beadm.1 -index a5ac900..ff97c93 100644 ---- beadm.1 +--- beadm.1.orig 2017-01-13 23:25:44 UTC +++ beadm.1 -@@ -87,9 +87,11 @@ If the -e param is specified, the new environment will be cloned from the given +@@ -87,9 +87,11 @@ If the -e param is specified, the new environment will Creates a snapshot of the existing boot environment named .Ar beName . .Pp