Check if jail is running before destroying it and if, don't attempt t…

iocage_cli/destroy.py

@@ -112,15 +112,6 @@ def cli(force, release, download, jails, recursive):
 
     if jails and not release:
         for jail in jails:
-
-            iocage = ioc.IOCage(jail=jail, skip_jails=True)
-            if iocage.jail.running:
-                ioc_common.logit({
-                    "level"  : "EXCEPTION",
-                    "message": (f"Jail {jail} is still running, "
-                                f"cannot destroy running jail")})
-                return
-
             if not force:
                 ioc_common.logit({
                     "level": "WARNING",
@@ -132,18 +123,11 @@ def cli(force, release, download, jails, recursive):
 
             child_test(zfs, iocroot, jail, "jail", force=force,
                        recursive=recursive)
-            iocage.destroy_jail()
+
+            ioc.IOCage(jail=jail,
+                       skip_jails=True).destroy_jail(force=force)
     elif jails and release:
         for release in jails:
-
-            iocage = ioc.IOCage(jail=release, skip_jails=True)
-            if iocage.jail.running:
-                ioc_common.logit({
-                    "level": "EXCEPTION",
-                    "message": (f"Jail {release} is still running, "
-                                f"cannot destroy running jail")})
-                return
-
             if not force:
                 ioc_common.logit({
                     "level": "WARNING",
@@ -156,7 +140,8 @@ def cli(force, release, download, jails, recursive):
             child_test(zfs, iocroot, release, "release", force=force,
                        recursive=recursive)
 
-            iocage.destroy_release(download)
+            ioc.IOCage(jail=release,
+                       skip_jails=True).destroy_release(download)
     elif not jails and release:
         ioc_common.logit({
             "level": "EXCEPTION",

iocage_lib/iocage.py

@@ -686,7 +686,7 @@ def destroy_release(self, download=False):
             ioc_destroy.IOCDestroy().__destroy_parse_datasets__(path,
                                                                 stop=False)
 
-    def destroy_jail(self):
+    def destroy_jail(self, force):
         """
         Destroys the supplied jail, to reduce perfomance hit,
         call IOCage with skip_jails=True
@@ -743,13 +743,24 @@ def destroy_jail(self):
         status, _ = self.list("jid", uuid=uuid)
 
         if status:
-            ioc_common.logit(
-                {
-                    "level": "INFO",
-                    "message": f"Stopping {uuid}"
-                },
-                _callback=self.callback,
-                silent=self.silent)
+            if not force:
+                ioc_common.logit(
+                    {
+                        "level": "EXCEPTION",
+                        "message": (f"Jail {uuid} is still running, "
+                                    f"please stop the jail first "
+                                    f"or destroy it with -f")
+                    }
+                )
+                return
+            else:
+                ioc_common.logit(
+                    {
+                        "level": "INFO",
+                        "message": f"Stopping {uuid}"
+                    },
+                    _callback=self.callback,
+                    silent=self.silent)
 
         ioc_common.logit(
             {