Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpm-ostree: Setup readonly sysroot for ostree & rw karg #5427

Merged
merged 1 commit into from
Jan 29, 2024
Merged

rpm-ostree: Setup readonly sysroot for ostree & rw karg #5427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion pyanaconda/modules/payloads/payload/rpm_ostree/installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,8 @@ def _set_kargs(self):
if root_data.type == "btrfs subvolume":
set_kargs_args.append("rootflags=subvol=" + root_name)

set_kargs_args.append("rw")

safe_exec_with_redirect("ostree", set_kargs_args, root=self._sysroot)


Expand Down Expand Up @@ -515,7 +517,18 @@ def run(self):
self._data.remote + ':' + ref]
)

log.info("ostree deploy complete")
log.info("ostree config set sysroot.readonly true")

safe_exec_with_redirect(
"ostree",
["config",
"--repo=" + self._sysroot + "/ostree/repo",
"set",
"sysroot.readonly",
"true"]
)

log.info("ostree admin deploy complete")
self.report_progress(_("Deployment complete: {}").format(ref))


Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def test_btrfs_run(self, devdata_mock, storage_mock, symlink_mock, rename_mock,
exec_mock.assert_called_once_with(
"ostree",
["admin", "instutil", "set-kargs", "BOOTLOADER-ARGS", "root=FSTAB-SPEC",
"rootflags=subvol=device-name"],
"rootflags=subvol=device-name", "rw"],
root=sysroot
)

Expand Down Expand Up @@ -661,7 +661,7 @@ def test_nonbtrfs_run(self, devdata_mock, storage_mock, symlink_mock, rename_moc
)
exec_mock.assert_called_once_with(
"ostree",
["admin", "instutil", "set-kargs", "BOOTLOADER-ARGS", "root=FSTAB-SPEC"],
["admin", "instutil", "set-kargs", "BOOTLOADER-ARGS", "root=FSTAB-SPEC", "rw"],
root=sysroot
)

Expand Down
Loading