commit 360e821dc8e66a8358b8cffee09a66040fb219e1
Author: Robert Millan <rmh@debian.org>
Date:   Mon Apr 30 16:11:42 2012 +0000

    Use legacy mode when mounting file systems. (Closes: #637086)

diff --git a/commit.d/format_zfs b/commit.d/format_zfs
index 21384d6..1d75e81 100755
--- a/commit.d/format_zfs
+++ b/commit.d/format_zfs
@@ -67,7 +67,7 @@ for dev in $DEVICES/*; do
 			log-output -t partman --pass-stdout \
 				zfs destroy "${fs}" >/dev/null || code=$?
 			log-output -t partman --pass-stdout \
-				zfs create -o mountpoint=none "${fs}" >/dev/null || code=$?
+				zfs create -o mountpoint=legacy "${fs}" >/dev/null || code=$?
 			sync
 			db_progress STOP
 
diff --git a/debian/changelog b/debian/changelog
index f2b2680..a7af159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+partman-zfs (19) UNRELEASED; urgency=low
+
+  * Use legacy mode when mounting file systems. (Closes: #637086)
+
+ -- Robert Millan <rmh@debian.org>  Mon, 30 Apr 2012 16:11:18 +0000
+
 partman-zfs (18) unstable; urgency=low
 
   [ Updated translations ]
diff --git a/debian/control b/debian/control
index 2e73532..1d01261 100644
--- a/debian/control
+++ b/debian/control
@@ -16,4 +16,6 @@ Depends: ${misc:Depends}, zfsutils-udeb (>= 8.1-4), zfs-modules, partman-basicfi
 # that supports ZVOL (see #635384).  Otherwise this dependency could be
 # removed.
  libparted0-udeb (>= 2.3-8),
+# Support for legacy mode, see #637082
+ busybox-udeb (>= 1:1.19.3-3),
 Description: Add to partman support for ZFS
diff --git a/mount.d/zfs b/mount.d/zfs
index 9d6fc36..c133493 100755
--- a/mount.d/zfs
+++ b/mount.d/zfs
@@ -11,7 +11,8 @@ pass=$6
 
 case $type in
     zfs)
-	zfs set mountpoint=/${mp#/} ${fs#/dev/zvol/} || exit 1
+	mount  ${type:+-t "$type"} ${options:+-o "$options"} $fs /target$mp || exit 1
+	echo "umount /target$mp"
 	exit 0
 	;;
 esac