diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-27 14:04:17 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-27 14:04:17 +0000 |
| commit | 14bd59301fc224d67b899d0f162bd90169d9bd8c (patch) | |
| tree | aada28cac5bbbad9ec55433fa605ce23f9b49111 /sysutils/beadm | |
| parent | Support staging. (diff) | |
- Fix 'beadm mount'
Submitted by: Adrian Waters <awaters@draenan.net>
Notes
Notes:
svn path=/head/; revision=331772
Diffstat (limited to 'sysutils/beadm')
| -rw-r--r-- | sysutils/beadm/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/beadm/files/patch-beadm | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile index 8218740644b4..e36bbcd29dc9 100644 --- a/sysutils/beadm/Makefile +++ b/sysutils/beadm/Makefile @@ -2,6 +2,7 @@ PORTNAME= beadm PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/sysutils/beadm/files/patch-beadm b/sysutils/beadm/files/patch-beadm new file mode 100644 index 000000000000..69f009650be6 --- /dev/null +++ b/sysutils/beadm/files/patch-beadm @@ -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 |