OS-603 don't zfs list in zone install brand hooks

6 files changed, 6 insertions, 12 deletions

diff --git a/usr/src/lib/brand/joyent/zone/jattach.ksh b/usr/src/lib/brand/joyent/zone/jattach.ksh
index 50f3734689..85f9a64ddc 100644
--- a/usr/src/lib/brand/joyent/zone/jattach.ksh
+++ b/usr/src/lib/brand/joyent/zone/jattach.ksh
@@ -63,8 +63,7 @@ ZROOT=$ZONEPATH/root
 # Get the dataset of the parent directory of the zonepath.
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 [ -z "$PDS_NAME" ] && \
     print -u2 "Brand error: missing parent ZFS dataset for $dname"
 
diff --git a/usr/src/lib/brand/joyent/zone/jinstall.ksh b/usr/src/lib/brand/joyent/zone/jinstall.ksh
index 6cf0bcd60b..fd42e55938 100644
--- a/usr/src/lib/brand/joyent/zone/jinstall.ksh
+++ b/usr/src/lib/brand/joyent/zone/jinstall.ksh
@@ -72,8 +72,7 @@ ZROOT=$ZONEPATH/root
 # Get the dataset of the parent directory of the zonepath.
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 [ -z "$PDS_NAME" ] && \
     print -u2 "Brand error: missing parent ZFS dataset for $dname"
 
diff --git a/usr/src/lib/brand/joyent/zone/juninstall.ksh b/usr/src/lib/brand/joyent/zone/juninstall.ksh
index 35463ed6f4..cc4fcf86fc 100644
--- a/usr/src/lib/brand/joyent/zone/juninstall.ksh
+++ b/usr/src/lib/brand/joyent/zone/juninstall.ksh
@@ -52,8 +52,7 @@ fi
 # Get the dataset of the parent directory of the zonepath.
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 if [[ -z "$PDS_NAME" ]]; then
 	print -u2 "Brand error: missing parent ZFS dataset for $dname"
 	exit $ZONE_SUBPROC_USAGE
diff --git a/usr/src/lib/brand/kvm/zone/kattach.ksh b/usr/src/lib/brand/kvm/zone/kattach.ksh
index 945b4d0873..f31338b367 100755
--- a/usr/src/lib/brand/kvm/zone/kattach.ksh
+++ b/usr/src/lib/brand/kvm/zone/kattach.ksh
@@ -63,8 +63,7 @@ ZROOT=$ZONEPATH/root
 # Get the dataset of the parent directory of the zonepath.
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 [ -z "$PDS_NAME" ] && \
     print -u2 "Brand error: missing parent ZFS dataset for $dname"
 
diff --git a/usr/src/lib/brand/kvm/zone/kinstall.ksh b/usr/src/lib/brand/kvm/zone/kinstall.ksh
index b9a7a57f4e..912fbeaeb1 100755
--- a/usr/src/lib/brand/kvm/zone/kinstall.ksh
+++ b/usr/src/lib/brand/kvm/zone/kinstall.ksh
@@ -62,8 +62,7 @@ ZROOT=${ZONEPATH}/root
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
 
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 [ -z "$PDS_NAME" ] && \
     print -u2 "Brand error: missing parent ZFS dataset for $dname"
 
diff --git a/usr/src/lib/brand/kvm/zone/kuninstall.ksh b/usr/src/lib/brand/kvm/zone/kuninstall.ksh
index 3824d0e0aa..7524e20fbc 100755
--- a/usr/src/lib/brand/kvm/zone/kuninstall.ksh
+++ b/usr/src/lib/brand/kvm/zone/kuninstall.ksh
@@ -52,8 +52,7 @@ fi
 # Get the dataset of the parent directory of the zonepath.
 dname=${ZONEPATH%/*}
 bname=${ZONEPATH##*/}
-zfs list -H -t filesystem -o mountpoint,name | egrep "^$dname	" | \
-    read mp PDS_NAME
+PDS_NAME=`mount | nawk -v p=$dname '{if ($1 == p) print $3}'`
 if [[ -z "$PDS_NAME" ]]; then
 	print -u2 "Brand error: missing parent ZFS dataset for $dname"
 	exit $ZONE_SUBPROC_USAGE