From 99a17f8ac149fce867905c6dce6945284399434a Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 7 Oct 2022 16:07:51 +0200 Subject: [PATCH 1/2] distro/rhel: make edge images properly sysroot.readonly=true Make edge raw images (both the raw image type and the same in the edge simplified installer) mount the /sysroot as read-only. This was already done in Fedora 37+ (547f7a66b3bcbb9cc498ed1b4db23a081883bc49). Copied commit message from 6f89e9d49956102fdeddd441fbc6e9f50f27ae92 to a comment in all places where the accompanying "rw" kernel option is set explaining the requirement, since the option is counter-intuitive. Signed-off-by: Antonio Murdaca Signed-off-by: Antonio Murdaca Co-Authored-By: Achilleas Koutsou --- internal/distro/fedora/images.go | 2 ++ internal/distro/rhel8/pipelines.go | 5 ++- internal/distro/rhel9/images.go | 10 ++++-- test/cases/ostree-raw-image.sh | 6 ++-- test/cases/ostree-simplified-installer.sh | 10 +++--- test/data/ansible/check_ostree.yaml | 37 ++++++++++++++++++----- 6 files changed, 51 insertions(+), 19 deletions(-) diff --git a/internal/distro/fedora/images.go b/internal/distro/fedora/images.go index b1c95c4c91..23e70e92c6 100644 --- a/internal/distro/fedora/images.go +++ b/internal/distro/fedora/images.go @@ -365,6 +365,8 @@ func iotRawImage(workload workload.Workload, img.Users = users.UsersFromBP(customizations.GetUsers()) img.Groups = users.GroupsFromBP(customizations.GetGroups()) + // "rw" kernel option is required when /sysroot is mounted read-only to + // keep stateful parts of the filesystem writeable (/var/ and /etc) img.KernelOptionsAppend = []string{"modprobe.blacklist=vc4", "rw"} img.Keyboard = "us" img.Locale = "C.UTF-8" diff --git a/internal/distro/rhel8/pipelines.go b/internal/distro/rhel8/pipelines.go index a125bcbe1d..7293c2b9ac 100644 --- a/internal/distro/rhel8/pipelines.go +++ b/internal/distro/rhel8/pipelines.go @@ -953,9 +953,12 @@ func ostreeDeployPipeline( OSName: osname, }, )) - p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, false))) + p.AddStage(osbuild.NewOSTreeConfigStage(ostreeConfigStageOptions(repoPath, true))) p.AddStage(osbuild.NewMkdirStage(efiMkdirStageOptions())) kernelOpts := osbuild.GenImageKernelOptions(pt) + // "rw" kernel option is required when /sysroot is mounted read-only to + // keep stateful parts of the filesystem writeable (/var/ and /etc) + kernelOpts = append(kernelOpts, "rw") p.AddStage(osbuild.NewOSTreeDeployStage( &osbuild.OSTreeDeployStageOptions{ OsName: osname, diff --git a/internal/distro/rhel9/images.go b/internal/distro/rhel9/images.go index f5e87c1490..1706154fd0 100644 --- a/internal/distro/rhel9/images.go +++ b/internal/distro/rhel9/images.go @@ -317,9 +317,12 @@ func edgeRawImage(workload workload.Workload, img.Users = users.UsersFromBP(customizations.GetUsers()) img.Groups = users.GroupsFromBP(customizations.GetGroups()) - img.KernelOptionsAppend = []string{"modprobe.blacklist=vc4"} + // "rw" kernel option is required when /sysroot is mounted read-only to + // keep stateful parts of the filesystem writeable (/var/ and /etc) + img.KernelOptionsAppend = []string{"modprobe.blacklist=vc4", "rw"} img.Keyboard = "us" img.Locale = "C.UTF-8" + img.SysrootReadOnly = true img.Platform = t.platform img.Workload = workload @@ -361,9 +364,12 @@ func edgeSimplifiedInstallerImage(workload workload.Workload, rawImg.Users = users.UsersFromBP(customizations.GetUsers()) rawImg.Groups = users.GroupsFromBP(customizations.GetGroups()) - rawImg.KernelOptionsAppend = []string{"modprobe.blacklist=vc4"} + // "rw" kernel option is required when /sysroot is mounted read-only to + // keep stateful parts of the filesystem writeable (/var/ and /etc) + rawImg.KernelOptionsAppend = []string{"modprobe.blacklist=vc4", "rw"} rawImg.Keyboard = "us" rawImg.Locale = "C.UTF-8" + rawImg.SysrootReadOnly = true rawImg.Platform = t.platform rawImg.Workload = workload diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh index 5717151158..243307ed61 100755 --- a/test/cases/ostree-raw-image.sh +++ b/test/cases/ostree-raw-image.sh @@ -491,7 +491,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS - sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 + sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e edge_type=edge-raw-image -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result # Clean up BIOS VM @@ -567,7 +567,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e edge_type=edge-raw-image -e ostree_commit="${INSTALL_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result ################################################################## @@ -721,7 +721,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e ostree_commit="${UPGRADE_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e edge_type=edge-raw-image -e ostree_commit="${UPGRADE_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result # Final success clean up diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh index ed84096081..f4d21b19fc 100755 --- a/test/cases/ostree-simplified-installer.sh +++ b/test/cases/ostree-simplified-installer.sh @@ -519,7 +519,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e edge_type=edge-simplified-installer -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result # Clean up BIOS VM @@ -643,7 +643,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e edge_type=edge-simplified-installer -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result # Clean up BIOS VM @@ -765,7 +765,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e edge_type=edge-simplified-installer -e fdo_credential="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result greenprint "🧹 Clean up VM" @@ -882,7 +882,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e fdo_credential="false" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${INSTALL_HASH}" -e edge_type=edge-simplified-installer -e fdo_credential="false" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result ######################## @@ -1016,7 +1016,7 @@ ansible_become_pass=${EDGE_USER_PASSWORD} EOF # Test IoT/Edge OS -sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${UPGRADE_HASH}" -e fdo_credential="false" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 +sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${UPGRADE_HASH}" -e edge_type=edge-simplified-installer -e fdo_credential="false" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result # Final success clean up diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml index 96919b737e..c8313c4d16 100644 --- a/test/data/ansible/check_ostree.yaml +++ b/test/data/ansible/check_ostree.yaml @@ -5,6 +5,7 @@ workspace: "{{ lookup('env', 'WORKSPACE') }}" skip_rollback_test: "false" fdo_credential: "false" + edge_type: "none" embeded_container: "false" total_counter: "0" failed_counter: "0" @@ -232,7 +233,28 @@ shell: findmnt -r -o OPTIONS -n /sysroot | awk -F "," '{print $1}' register: result_sysroot_mount_status - - name: /sysroot should be mount with rw permission + # https://fedoraproject.org/wiki/Changes/Silverblue_Kinoite_readonly_sysroot + # There are three checks here for /sysroot permission based on pr https://github.com/osbuild/osbuild-composer/pull/3053 + # 1. for edge-commit and edge-installer, check ro when fedora >= 37 + # 2. for edge-commit and edge-installer, check rw for other os. + # 3. for edge-simplified-installer and edge-raw-image, check ro for all os. + - name: /sysroot should be mount with ro permission for edge-commit and edge-installer on Fedora >= 37 + block: + - assert: + that: + - result_sysroot_mount_status.stdout == "ro" + fail_msg: "/sysroot is not mounted with ro permission" + success_msg: "/sysroot is mounted with ro permission" + always: + - set_fact: + total_counter: "{{ total_counter | int + 1 }}" + rescue: + - name: failed count + 1 + set_fact: + failed_counter: "{{ failed_counter | int + 1 }}" + when: (edge_type == "none") and (ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '>=')) + + - name: /sysroot should be mount with rw permission for edge-commit and edge-installer on all OS except Fedora >= 37 block: - assert: that: @@ -246,11 +268,10 @@ - name: failed count + 1 set_fact: failed_counter: "{{ failed_counter | int + 1 }}" - when: (ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or - (ansible_facts['distribution'] == 'CentOS') or (ansible_facts['distribution'] == 'RedHat') + when: (edge_type == "none") and ((ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or + (ansible_facts['distribution'] == 'CentOS') or (ansible_facts['distribution'] == 'RedHat')) - # https://fedoraproject.org/wiki/Changes/Silverblue_Kinoite_readonly_sysroot - - name: /sysroot should be mount with ro permission since Fedora 37 + - name: /sysroot should be mount with ro permission for edge-simplified-installer and edge-raw-image block: - assert: that: @@ -264,7 +285,7 @@ - name: failed count + 1 set_fact: failed_counter: "{{ failed_counter | int + 1 }}" - when: ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '>=') + when: edge_type == "edge-simplified-installer" or edge_type == "edge-raw-image" # case: check /var mount point - name: check /var mount point @@ -397,8 +418,8 @@ - name: failed count + 1 set_fact: failed_counter: "{{ failed_counter | int + 1 }}" - when: (ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or - (ansible_facts['distribution'] == 'CentOS') or (ansible_facts['distribution'] == 'RedHat') + when: (edge_type == "none") and ((ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or + (ansible_facts['distribution'] == 'CentOS') or (ansible_facts['distribution'] == 'RedHat')) # case: check dmesg error and failed log - name: check dmesg output From 5f883da28ecd2e71dbf1307ddf9cf0bf4d2eaf01 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Sun, 11 Dec 2022 15:08:08 +0100 Subject: [PATCH 2/2] test: update manifests for edge-raw-image and edge-simplified-installer --- .../manifests/centos_8-aarch64-edge_raw_image-boot.json | 5 +++-- .../centos_8-aarch64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/centos_8-x86_64-edge_raw_image-boot.json | 5 +++-- .../centos_8-x86_64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/centos_9-aarch64-edge_raw_image-boot.json | 7 ++++--- .../centos_9-aarch64-edge_simplified_installer-boot.json | 7 ++++--- .../manifests/centos_9-x86_64-edge_raw_image-boot.json | 7 ++++--- .../centos_9-x86_64-edge_simplified_installer-boot.json | 7 ++++--- .../data/manifests/rhel_8-aarch64-edge_raw_image-boot.json | 5 +++-- .../rhel_8-aarch64-edge_simplified_installer-boot.json | 5 +++-- test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json | 5 +++-- .../rhel_8-x86_64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/rhel_86-aarch64-edge_raw_image-boot.json | 5 +++-- .../rhel_86-aarch64-edge_simplified_installer-boot.json | 5 +++-- .../data/manifests/rhel_86-x86_64-edge_raw_image-boot.json | 5 +++-- .../rhel_86-x86_64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/rhel_87-aarch64-edge_raw_image-boot.json | 5 +++-- .../rhel_87-aarch64-edge_simplified_installer-boot.json | 5 +++-- .../data/manifests/rhel_87-x86_64-edge_raw_image-boot.json | 5 +++-- .../rhel_87-x86_64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/rhel_88-aarch64-edge_raw_image-boot.json | 5 +++-- .../rhel_88-aarch64-edge_simplified_installer-boot.json | 5 +++-- .../data/manifests/rhel_88-x86_64-edge_raw_image-boot.json | 5 +++-- .../rhel_88-x86_64-edge_simplified_installer-boot.json | 5 +++-- .../manifests/rhel_90-aarch64-edge_raw_image-boot.json | 7 ++++--- .../rhel_90-aarch64-edge_simplified_installer-boot.json | 7 ++++--- .../data/manifests/rhel_90-x86_64-edge_raw_image-boot.json | 7 ++++--- .../rhel_90-x86_64-edge_simplified_installer-boot.json | 7 ++++--- .../manifests/rhel_91-aarch64-edge_raw_image-boot.json | 7 ++++--- .../rhel_91-aarch64-edge_simplified_installer-boot.json | 7 ++++--- .../data/manifests/rhel_91-x86_64-edge_raw_image-boot.json | 7 ++++--- .../rhel_91-x86_64-edge_simplified_installer-boot.json | 7 ++++--- .../manifests/rhel_92-aarch64-edge_raw_image-boot.json | 7 ++++--- .../rhel_92-aarch64-edge_simplified_installer-boot.json | 7 ++++--- .../data/manifests/rhel_92-x86_64-edge_raw_image-boot.json | 7 ++++--- .../rhel_92-x86_64-edge_simplified_installer-boot.json | 7 ++++--- 36 files changed, 124 insertions(+), 88 deletions(-) diff --git a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json index 04b57b61e7..45788f1daf 100644 --- a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json @@ -2466,7 +2466,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2497,7 +2497,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json index 496b2a2a95..d2c28aabbc 100644 --- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json @@ -2506,7 +2506,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2537,7 +2537,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json index fe4b7f9eb4..48601d01bf 100644 --- a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json @@ -2514,7 +2514,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2545,7 +2545,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json index 8ad28c40a5..e1f4bf5ec9 100644 --- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json @@ -2570,7 +2570,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2601,7 +2601,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json index 6beddb0b1e..fd85081407 100644 --- a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json @@ -2222,7 +2222,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2253,7 +2254,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2379,7 +2380,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "centos", "install": true, diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json index 2a3fd039ea..c1bd3b444e 100644 --- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json @@ -2606,7 +2606,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2637,7 +2638,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2763,7 +2764,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "centos", "install": true, diff --git a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json index a5b5eee8ac..ca9bae11c4 100644 --- a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json @@ -2349,7 +2349,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2380,7 +2381,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2506,7 +2507,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "legacy": "i386-pc", "uefi": { "vendor": "centos", diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json index 1176e12fc7..d1f57e1463 100644 --- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json @@ -2661,7 +2661,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2692,7 +2693,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2818,7 +2819,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "centos", "install": true, diff --git a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json index 6edf9e41d5..9462849b24 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json @@ -984,7 +984,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1015,7 +1015,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json index 7b61053150..8484c6612b 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json @@ -1004,7 +1004,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1035,7 +1035,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json index 70bd54a83a..cc2cda8a13 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json @@ -1002,7 +1002,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1033,7 +1033,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json index a69a31fbae..1ea268e6df 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json @@ -1028,7 +1028,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1059,7 +1059,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json index 5ebfad1dd5..2e4c33d386 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json @@ -984,7 +984,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1015,7 +1015,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json index 576521e8c5..f9f8b4a097 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json @@ -1004,7 +1004,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1035,7 +1035,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json index 2f2d27bc5f..e4e2000230 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json @@ -1002,7 +1002,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1033,7 +1033,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json index 40830fb4bb..8468a6f6b3 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json @@ -1028,7 +1028,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1059,7 +1059,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json index a5338fc53b..6207a1de84 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json @@ -981,7 +981,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1012,7 +1012,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json index 9df9f98c55..051b49a43a 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json @@ -1001,7 +1001,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1032,7 +1032,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json index 2b35df60dc..67575debd1 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json @@ -999,7 +999,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1030,7 +1030,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json index 4ff0c1eae2..9a84c05dd8 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json @@ -1025,7 +1025,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1056,7 +1056,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json index ed10217e46..0fd95b3adc 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json @@ -981,7 +981,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1012,7 +1012,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json index d6869a55f9..7ff568c8c9 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json @@ -1001,7 +1001,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1032,7 +1032,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json index a34114786b..d466068302 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json @@ -999,7 +999,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1030,7 +1030,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json index ddd1f20a4c..c9e446aada 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json @@ -1025,7 +1025,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1056,7 +1056,8 @@ "label": "root" }, "kernel_opts": [ - "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "rw" ] } }, diff --git a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json index c72aa667a0..4e8cb8ad25 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json @@ -835,7 +835,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -866,7 +867,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -992,7 +993,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json index 2ec4774a22..a233a79a92 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json @@ -984,7 +984,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -1015,7 +1016,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1141,7 +1142,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json index eae0baee98..872b7de91e 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json @@ -883,7 +883,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -914,7 +915,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1040,7 +1041,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "legacy": "i386-pc", "uefi": { "vendor": "redhat", diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json index 9ab4080790..0e0fb1fa9a 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json @@ -1005,7 +1005,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -1036,7 +1037,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -1162,7 +1163,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json index 060e614083..fea0bb8d4c 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json @@ -2230,7 +2230,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2261,7 +2262,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2387,7 +2388,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json index cbb585a7d9..38e0101f0a 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json @@ -2614,7 +2614,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2645,7 +2646,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2771,7 +2772,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json index c3bbc3e6ef..a2cfe535c7 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json @@ -2350,7 +2350,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2381,7 +2382,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2507,7 +2508,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "legacy": "i386-pc", "uefi": { "vendor": "redhat", diff --git a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json index 9610c70c15..f803173c82 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json @@ -2662,7 +2662,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2693,7 +2694,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2819,7 +2820,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json index 0ff7577047..65f86857ba 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json @@ -2230,7 +2230,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2261,7 +2262,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2387,7 +2388,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json index e21b9bb8d2..ae1caa0900 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json @@ -2614,7 +2614,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2645,7 +2646,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2771,7 +2772,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true, diff --git a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json index eb13146338..5340dfcf2c 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json @@ -2350,7 +2350,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2381,7 +2382,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2507,7 +2508,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "legacy": "i386-pc", "uefi": { "vendor": "redhat", diff --git a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json index 408d0b6bf2..0b70c31644 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json @@ -2662,7 +2662,8 @@ }, "kernel_opts": [ "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "modprobe.blacklist=vc4" + "modprobe.blacklist=vc4", + "rw" ] } }, @@ -2693,7 +2694,7 @@ "repo": "/ostree/repo", "config": { "sysroot": { - "readonly": false, + "readonly": true, "bootloader": "none" } } @@ -2819,7 +2820,7 @@ "options": { "root_fs_uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4", + "kernel_opts": "luks.uuid=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75,modprobe.blacklist=vc4,rw", "uefi": { "vendor": "redhat", "install": true,