Skip to content

Commit 3e075fb

Browse files
committed
use multiline string for mounts
Signed-off-by: Zen <[email protected]>
1 parent 86f4327 commit 3e075fb

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/ugrd/fs/mounts.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ def autodetect_root(self) -> None:
569569
if self["autodetect_root_dm"]:
570570
if self["mounts"]["root"]["type"] == "btrfs":
571571
from ugrd.fs.btrfs import _get_btrfs_mount_devices
572+
572573
for device in _get_btrfs_mount_devices(self, "/"):
573574
_autodetect_dm(self, "/", device)
574575
else:
@@ -754,16 +755,16 @@ def check_mounts(self) -> None:
754755
_validate_host_mount(self, mount, "/" if mount_name == "root" else None)
755756

756757

757-
def mount_root(self) -> list[str]:
758+
def mount_root(self) -> str:
758759
"""Mounts the root partition to $MOUNTS_ROOT_TARGET."""
759-
return [
760-
'if grep -qs "$(readvar MOUNTS_ROOT_TARGET)" /proc/mounts; then',
761-
' ewarn "Root mount already exists, unmounting: $(readvar MOUNTS_ROOT_TARGET)"',
762-
' umount "$(readvar MOUNTS_ROOT_TARGET)"',
763-
"fi",
764-
'''einfo "Mounting '$(readvar MOUNTS_ROOT_SOURCE)' ($(readvar MOUNTS_ROOT_TYPE)) to '$(readvar MOUNTS_ROOT_TARGET)' with options: $(readvar MOUNTS_ROOT_OPTIONS)"''',
765-
f'retry {self["mount_retries"] or -1} {self["mount_timeout"]} mount "$(readvar MOUNTS_ROOT_SOURCE)" -t "$(readvar MOUNTS_ROOT_TYPE)" "$(readvar MOUNTS_ROOT_TARGET)" -o "$(readvar MOUNTS_ROOT_OPTIONS)"',
766-
]
760+
return f"""
761+
if grep -qs "$(readvar MOUNTS_ROOT_TARGET)" /proc/mounts; then
762+
ewarn "Root mount already exists, unmounting: $(readvar MOUNTS_ROOT_TARGET)"
763+
umount "$(readvar MOUNTS_ROOT_TARGET)"
764+
fi
765+
einfo "Mounting '$(readvar MOUNTS_ROOT_SOURCE)' ($(readvar MOUNTS_ROOT_TYPE)) to '$(readvar MOUNTS_ROOT_TARGET)' with options: $(readvar MOUNTS_ROOT_OPTIONS)"
766+
retry {self["mount_retries"] or -1} {self["mount_timeout"]} mount "$(readvar MOUNTS_ROOT_SOURCE)" -t "$(readvar MOUNTS_ROOT_TYPE)" "$(readvar MOUNTS_ROOT_TARGET)" -o "$(readvar MOUNTS_ROOT_OPTIONS)"
767+
"""
767768

768769

769770
def export_mount_info(self) -> None:

0 commit comments

Comments
 (0)