workaround ZFS unjail issue

bsdci · Sep 20, 2018 · 52aca6f · 52aca6f
1 parent dd40360
commit 52aca6f
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/iocage/ZFSShareStorage.py b/iocage/ZFSShareStorage.py
@@ -54,15 +54,26 @@ def umount_zfs_shares(self) -> None:
         """Unmount a running jails shared ZFS datasets."""
         for dataset in self.get_zfs_datasets():
             self.logger.verbose(f"Unmounting ZFS Dataset {dataset.name}")
-            self._exec_jail([
+            self._exec([
+                "/sbin/zfs",
+                "set",
+                "jailed=off",
+                dataset.name
+            ])
+            self._exec([
                 "/sbin/zfs",
                 "umount",
                 dataset.name
             ])
             self._exec([
                 "/sbin/zfs",
-                "unjail",
-                self.jail.identifier,
+                "mount",
+                dataset.name
+            ])
+            self._exec([
+                "/sbin/zfs",
+                "set",
+                "jailed=on",
                 dataset.name
             ])