Index: head/sysutils/beadm/Makefile
===================================================================
--- head/sysutils/beadm/Makefile	(revision 459379)
+++ head/sysutils/beadm/Makefile	(revision 459380)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	beadm
 PORTVERSION=	1.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		LOCAL/bdrewery/${PORTNAME}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Solaris-like utility to manage Boot Environments on ZFS
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vermaden
 
 NO_BUILD=	YES
 
 CONFLICTS_INSTALL=	beadm-devel-*
 
 PLIST_FILES=	sbin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
 	    ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
 	  ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>
Index: head/sysutils/beadm/files/patch-beadm
===================================================================
--- head/sysutils/beadm/files/patch-beadm	(revision 459379)
+++ head/sysutils/beadm/files/patch-beadm	(revision 459380)
@@ -1,90 +1,126 @@
---- 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
    local SOURCE=$( echo ${1} | cut -d '@' -f 1 )
 +  local ENTROPY=0
 +  # secure current /boot/entropy file
 +  if [ -f /boot/entropy ]
 +  then
 +    if ! cp -p /boot/entropy /boot/entropy.OLD 1> /dev/null 2> /dev/null
 +    then
 +      echo "ERROR: Can not copy current '/boot/entropy' file"
 +      exit 1
 +    fi
 +    ENTROPY=1
 +  fi
 +  # create new /boot/entropy file that would be used in new boot environment
 +  if ! dd if=/dev/random of=/boot/entropy bs=4096 count=1 1> /dev/null 2> /dev/null
 +  then
 +    echo "ERROR: Can not generate new '/boot/entropy' file"
 +    exit 1
 +  fi
 +  # create snapshot that will be used as a base for new boot environment
    if __be_snapshot ${1}
    then
      # create boot environment from snapshot
 @@ -138,6 +156,13 @@ __be_new() { # 1=SOURCE 2=TARGET
            if ! zfs list -H -o name ${FS}@${SNAPSHOT} 1> /dev/null 2> /dev/null
            then
              echo "ERROR: Child snapshot '${FS}@${SNAPSHOT}' does not exist"
 +            if [ ${ENTROPY} -ne 0 ]
 +            then
 +              if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
 +              then
 +                echo "WARNING: Can not bring back original '/boot/entropy' file"
 +              fi
 +            fi
              exit 1
            fi
          done
 @@ -146,6 +171,13 @@ __be_new() { # 1=SOURCE 2=TARGET
      if zfs list -H -o name ${1}@${2##*/} 1> /dev/null 2> /dev/null
      then
        echo "ERROR: Snapshot '${1}@${2##*/}' already exists"
 +      if [ ${ENTROPY} -ne 0 ]
 +      then
 +        if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
 +        then
 +          echo "WARNING: Can not bring back original '/boot/entropy' file"
 +        fi
 +      fi
        exit 1
      fi
      # snapshot format
 @@ -153,9 +185,25 @@ __be_new() { # 1=SOURCE 2=TARGET
      if ! zfs snapshot -r ${1}@${FMT} 1> /dev/null 2> /dev/null
      then
        echo "ERROR: Cannot create snapshot '${1}@${FMT}'"
 +      if [ ${ENTROPY} -ne 0 ]
 +      then
 +        if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
 +        then
 +          echo "WARNING: Can not bring back original '/boot/entropy' file"
 +        fi
 +      fi
        exit 1
      fi
    fi
 +  # bring back secured /boot/entropy.OLD file
 +  if [ -f /boot/entropy.OLD ]
 +  then
 +    if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
 +    then
 +      echo "WARNING: Can not bring back original '/boot/entropy' file"
 +    fi
 +  fi
 +  unset ENTROPY
    # clone properties of source boot environment
    zfs list -H -o name -r ${SOURCE} \
      | grep -v '@' \
 @@ -303,7 +351,7 @@ case ${1} in
          while(CMD_ZFS_LIST BENAME_BEGINS_WITH | getline) {
            if($1 != BENAME_BEGINS_WITH) {
              FSNAME = $1
 -            FSNAMES[length(FSNAME) + 1] = FSNAME
 +            FSNAMES[length(FSNAMES) + 1] = FSNAME
              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}
Index: head/sysutils/beadm/files/patch-beadm.1
===================================================================
--- head/sysutils/beadm/files/patch-beadm.1	(revision 459379)
+++ head/sysutils/beadm/files/patch-beadm.1	(revision 459380)
@@ -1,24 +1,22 @@
 commit 25a066def7cddd0f9178d07531b1f18703308db0
 Author: Alan Somers <asomers@gmail.com>
 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
 -.It
 -.Ic destroy Op Fl F
 +.It Xo
 +.Ic destroy
 +.Op Fl F
  .Ao Ar beName | beName@snapshot Ac
 +.Xc
  .Pp
  Destroys the given
  .Ar beName