Skip to content

Commit

Permalink
Set /sysroot RO on simplified installer and raw image test for
Browse files Browse the repository at this point in the history
RHEL 8.8 and CS8

The RO setting on RHEL 8.8 and CS8 is not configured by ostree,
but osbuild-composer by PR
osbuild/osbuild-composer#3178
  • Loading branch information
henrywang committed Feb 19, 2023
1 parent 9defc57 commit 22a1156
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ostree-raw-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ SYSROOT_RO="false"
# Prepare osbuild-composer repository file
sudo mkdir -p /etc/osbuild-composer/repositories

# RHEL 8.8 and CS8 is still RO for /sysroot on raw image and simplified installer
# The RO setting on RHEL 8.8 and CS8 is not configured by ostree, but osbuild-composer
# by PR https://github.com/osbuild/osbuild-composer/pull/3178
case "${ID}-${VERSION_ID}" in
"rhel-8.6")
OSTREE_REF="rhel/8/${ARCH}/edge"
Expand All @@ -66,6 +69,7 @@ case "${ID}-${VERSION_ID}" in
OS_VARIANT="rhel8-unknown"
ADD_SSSD="true"
USER_IN_RAW="true"
SYSROOT_RO="true"
;;
"rhel-9.0")
OSTREE_REF="rhel/9/${ARCH}/edge"
Expand All @@ -91,6 +95,7 @@ case "${ID}-${VERSION_ID}" in
OS_VARIANT="centos-stream8"
ADD_SSSD="true"
USER_IN_RAW="true"
SYSROOT_RO="true"
;;
"centos-9")
OSTREE_REF="centos/9/${ARCH}/edge"
Expand Down
5 changes: 5 additions & 0 deletions ostree-simplified-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ SYSROOT_RO="false"
# Prepare osbuild-composer repository file
sudo mkdir -p /etc/osbuild-composer/repositories

# RHEL 8.8 and CS8 is still RO for /sysroot on raw image and simplified installer
# The RO setting on RHEL 8.8 and CS8 is not configured by ostree, but osbuild-composer
# by PR https://github.com/osbuild/osbuild-composer/pull/3178
case "${ID}-${VERSION_ID}" in
"rhel-8.6")
OSTREE_REF="rhel/8/${ARCH}/edge"
Expand All @@ -75,6 +78,7 @@ case "${ID}-${VERSION_ID}" in
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
IMAGE_NAME="image.raw.xz"
SYSROOT_RO="true"
;;
"rhel-9.0")
OSTREE_REF="rhel/9/${ARCH}/edge"
Expand All @@ -98,6 +102,7 @@ case "${ID}-${VERSION_ID}" in
OSTREE_REF="centos/8/${ARCH}/edge"
OS_VARIANT="centos-stream8"
IMAGE_NAME="image.raw.xz"
SYSROOT_RO="true"
;;
"centos-9")
OSTREE_REF="centos/9/${ARCH}/edge"
Expand Down

0 comments on commit 22a1156

Please sign in to comment.