fix regression in btrfs.py

Signed-off-by: Zen <[email protected]>

Author: desultory

src/ugrd/fs/btrfs.py

@@ -1,40 +1,31 @@
-__version__ = '0.6.0'
+__version__ = '0.6.2'
 __author__ = 'desultory'
 
 from ugrd.fs.mounts import _get_mount_source
 
 
 def _process_root_subvol(self, root_subvol: str) -> None:
-    """
-    processes the root subvolume
-    Removes options in the root mount if they are set
-    """
+    """ processes the root subvolume """
     self.update({'root_subvol': root_subvol})
     self.logger.debug("Set root_subvol to: %s", root_subvol)
 
 
 def _process_subvol_selector(self, subvol_selector: bool) -> None:
-    """
-    processes the subvol selector
-    """
+    """ Processes the subvol selector parameter, adds the base_mount_paths to paths if enabled. """
     if subvol_selector:
         self.update({'subvol_selector': subvol_selector})
         self.logger.debug("Set subvol_selector to: %s", subvol_selector)
         self['paths'] = self['base_mount_path']
 
 
 def btrfs_scan(self) -> str:
-    """
-    sccans for new mounts
-    """
+    """ scan for new btrfs devices. """
     return "btrfs device scan"
 
 
 def select_subvol(self) -> str:
-    """
-    Returns a bash script to list subvolumes on the root volume
-    """
-    if not self['subvol_selector']:
+    """ Returns a bash script to list subvolumes on the root volume. """
+    if not self.get('subvol_selector'):
         self.logger.log(5, "subvol_selector not set, skipping")
         return
 
@@ -69,7 +60,7 @@ def mount_subvol(self) -> str:
         return
 
     source = _get_mount_source(self, self['mounts']['root'])
-    destination = self['mounts']['root']['destination'] if not self.switch_root_target else self.switch_root_target
+    destination = self['mounts']['root']['destination'] if not self.get('switch_root_target') else self['switch_root_target']
 
     return f"mount -o subvol=$root_subvol {source} {destination}"
 

src/ugrd/initramfs_generator.py

@@ -46,7 +46,7 @@ def load_config(self) -> None:
         # Process into the config dict, it should handle parsing
         for config, value in raw_config.items():
             self.logger.debug("Processing config key: %s" % config)
-            self.config_dict[config] = value
+            self[config] = value
 
         self.logger.debug("Loaded config:\n%s" % self.config_dict)
 
@@ -211,7 +211,7 @@ def generate_init(self) -> None:
 
     def pack_build(self) -> None:
         """
-        Packs the initramfs based on self.config_dict['imports']['pack']
+        Packs the initramfs based on self['imports']['pack']
         """
         if self['imports'].get('pack'):
             self._run_hook('pack')