fix loading of default jail config when no defaults.json is present

Author: gronke

libiocage/lib/JailConfig.py

@@ -90,11 +90,17 @@ def __init__(self,
             self["legacy"] = False
 
         self.defaults_file = defaults_file
-        self.defaults = None
+        self._defaults = None
 
         self.clone(data)
 
-    def load_defaults(self, defaults_file=None):
+    @property
+    def defaults(self):
+        if self._defaults is None:
+            self._load_defaults()
+        return self._defaults
+
+    def _load_defaults(self, defaults_file=None):
 
         if defaults_file is not None:
             self.defaults_file = defaults_file
@@ -103,7 +109,7 @@ def load_defaults(self, defaults_file=None):
             root_mountpoint = self.jail.host.datasets.root.mountpoint
             defaults_file = f"{root_mountpoint}/defaults.json"
 
-        self.defaults = libiocage.lib.JailConfigDefaults.JailConfigDefaults(
+        self._defaults = libiocage.lib.JailConfigDefaults.JailConfigDefaults(
             file=defaults_file,
             logger=self.logger
         )
@@ -365,17 +371,21 @@ def _get_jail_zfs(self):
             enabled = self._default_jail_zfs()
 
         if not enabled:
-            if len(self.jail_zfs_dataset) > 0:
+            if len(self["jail_zfs_dataset"]) > 0:
                 raise libiocage.lib.errors.JailConigZFSIsNotAllowed(
-                    logger=self.logger)
+                    logger=self.logger
+                )
         return enabled
 
     def _set_jail_zfs(self, value, **kwargs):
         if (value is None) or (value == ""):
             del self.data["jail_zfs"]
             return
         self.data["jail_zfs"] = libiocage.lib.helpers.to_string(
-            value, true="on", false="off")
+            value,
+            true="on",
+            false="off"
+        )
 
     def _default_jail_zfs(self):
         # if self.data["jail_zfs"] does not explicitly exist,
@@ -395,7 +405,8 @@ def _set_resolver(self, value, **kwargs):
             resolver = self["resolver"]
         else:
             resolver = libiocage.lib.JailConfigResolver.JailConfigResolver(
-                jail_config=self)
+                jail_config=self
+            )
             resolver.update(value, notify=True)
 
     def _get_cloned_release(self):

libiocage/lib/JailConfigDefaults.py

@@ -55,7 +55,10 @@ def __init__(self, file, logger):
         self.logger = logger
         dict.__init__(self, JailConfigDefaults.DEFAULTS)
         self.file = file
-        self.read(file)
+        try:
+            self.read()
+        except:
+            pass
 
     def read(self):
 
@@ -67,7 +70,7 @@ def read(self):
         if not os.path.isfile(self.file):
             raise libiocage.lib.errors.DefaultConfigNotFound(
                 config_file_path=self.file,
-                logger=self.logger
+                logger=None
             )
 
         if self.logger:

libiocage/lib/Release.py

@@ -250,6 +250,7 @@ def fetch(self, update=None, fetch_updates=None):
         release_changed = False
 
         if not self.fetched:
+
             self._clean_dataset()
             self._create_dataset()
             self._ensure_dataset_mounted()
@@ -464,7 +465,7 @@ def _update_freebsd_jail(self, jail):
             "-f",
             "/var/db/freebsd-update/freebsd-update.conf",
             "install"
-        ], ignore_error=True, logger=self.logger)
+        ], ignore_error=True)
 
         if child.returncode != 0:
             if "No updates are available to install." in stdout: