From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 27 14:04:18 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 7570541A;
 Sun, 27 Oct 2013 14:04:18 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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 63421299B;
 Sun, 27 Oct 2013 14:04:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RE4I6g089244;
 Sun, 27 Oct 2013 14:04:18 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RE4INZ089242;
 Sun, 27 Oct 2013 14:04:18 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310271404.r9RE4INZ089242@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 27 Oct 2013 14:04:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331772 - in head/sysutils/beadm: . files
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Oct 2013 14:04:18 -0000

Author: bdrewery
Date: Sun Oct 27 14:04:17 2013
New Revision: 331772
URL: http://svnweb.freebsd.org/changeset/ports/331772

Log:
  - Fix 'beadm mount'
  
  Submitted by:	Adrian Waters <awaters@draenan.net>

Added:
  head/sysutils/beadm/files/
  head/sysutils/beadm/files/patch-beadm   (contents, props changed)
Modified:
  head/sysutils/beadm/Makefile

Modified: head/sysutils/beadm/Makefile
==============================================================================
--- head/sysutils/beadm/Makefile	Sun Oct 27 13:32:57 2013	(r331771)
+++ head/sysutils/beadm/Makefile	Sun Oct 27 14:04:17 2013	(r331772)
@@ -2,6 +2,7 @@
 
 PORTNAME=	beadm
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Added: head/sysutils/beadm/files/patch-beadm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/beadm/files/patch-beadm	Sun Oct 27 14:04:17 2013	(r331772)
@@ -0,0 +1,19 @@
+--- ./beadm.orig	2013-10-27 09:02:48.041131265 -0500
++++ ./beadm	2013-10-27 09:03:20.579130647 -0500
+@@ -715,7 +715,6 @@
+       echo "ERROR: Cannot mount '${2}' at '${TARGET}' mountpoint"
+       exit 1
+     fi
+-    PREFIX=$( echo ${POOL}/${BEDS}/${2}/ | sed 's/\//\\/g' )
+     zfs list -H -o name,mountpoint -r ${POOL}/${BEDS}/${2} \
+       | grep -v -E "[[:space:]](legacy|none)$" \
+       | sort -n \
+@@ -732,7 +731,7 @@
+                   continue
+                   ;;
+                 (*)
+-                  MOUNTPOINT="/$( echo "${FS}" | sed s/"${PREFIX}"//g )"
++                  MOUNTPOINT="/$( echo "${FS}" | sed s^"${POOL}/${BEDS}/${2}/"^^g )"
+                   ;;
+               esac
+             fi