fix newlines being added to var files

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

Author: desultory

src/ugrd/fs/btrfs.py

@@ -1,4 +1,4 @@
-__version__ = '0.8.1'
+__version__ = '0.8.2'
 __author__ = 'desultory'
 
 
@@ -50,7 +50,7 @@ def select_subvol(self) -> str:
            "                    echo 'Invalid selection'",
            "                else",
            '                    echo "Selected subvolume: $subvol"',
-           '                    echo ",subvol=$subvol" >> /run/MOUNTS_ROOT_OPTIONS',
+           '                    echo -n ",subvol=$subvol" >> /run/MOUNTS_ROOT_OPTIONS',
            "                    break",
            "                fi",
            "                ;;",
@@ -69,5 +69,5 @@ def set_root_subvol(self) -> str:
     Set the switch_root_target to the original root_mount path.
     """
     if root_subvol := self.get('root_subvol'):
-        return f'echo ",subvol={root_subvol}" >> /run/MOUNTS_ROOT_OPTIONS'
+        return f'echo -n ",subvol={root_subvol}" >> /run/MOUNTS_ROOT_OPTIONS'
 

src/ugrd/fs/mounts.py

@@ -302,9 +302,9 @@ def mount_root(self) -> str:
 
 def export_mount_info(self) -> None:
     """ Exports mount info based on the config to /run/MOUNTS_ROOT_{option} """
-    return [f'echo "{self["mounts"]["root"]["destination"]}" > "/run/MOUNTS_ROOT_TARGET"',
-            f'echo "{_get_mount_source(self, self["mounts"]["root"])}" > "/run/MOUNTS_ROOT_SOURCE"',
-            f'''echo "{','.join(self["mounts"]["root"]["options"])}" > "/run/MOUNTS_ROOT_OPTIONS"''']
+    return [f'echo -n "{self["mounts"]["root"]["destination"]}" > "/run/MOUNTS_ROOT_TARGET"',
+            f'echo -n "{_get_mount_source(self, self["mounts"]["root"])}" > "/run/MOUNTS_ROOT_SOURCE"',
+            f'''echo -n "{','.join(self["mounts"]["root"]["options"])}" > "/run/MOUNTS_ROOT_OPTIONS"''']
 
 
 def clean_mounts(self) -> list[str]: