svn commit: r331772 - in head/sysutils/beadm: . files

[Bryan Drewery]

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 at 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