From 962ef903b3969004cd67f2e511b056273cfe76d9 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 18:05:57 +0000 Subject: [PATCH 1/6] chore: update bootc to testing build --- Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Containerfile b/Containerfile index 681dd3f3..ec52c241 100644 --- a/Containerfile +++ b/Containerfile @@ -21,6 +21,8 @@ ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}" COPY sys_files/usr /usr +RUN dnf upgrade --enablerepo=updates-testing --refresh --advisory=FEDORA-2025-385734f715 + RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=ctx,src=/,dst=/ctx \ --mount=type=bind,from=config,src=/rpms,dst=/tmp/rpms \ From ccb75dd0c5826855e5ddc297a57cbe86a435f236 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 18:06:51 +0000 Subject: [PATCH 2/6] chore: run bootc container lint --- Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Containerfile b/Containerfile index ec52c241..493bd7bf 100644 --- a/Containerfile +++ b/Containerfile @@ -39,3 +39,5 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives && \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp + +RUN bootc container lint From d81d03fbce075c79187e5cb7850184ad78ebbc31 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 18:11:02 +0000 Subject: [PATCH 3/6] fix: replace via rpm-ostree --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 493bd7bf..b5eb791e 100644 --- a/Containerfile +++ b/Containerfile @@ -21,7 +21,7 @@ ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}" COPY sys_files/usr /usr -RUN dnf upgrade --enablerepo=updates-testing --refresh --advisory=FEDORA-2025-385734f715 +RUN rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2025-385734f715 RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=ctx,src=/,dst=/ctx \ From 0e0d0d18e8864d6ecbc4c684219b74583a2a175d Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 18:16:39 +0000 Subject: [PATCH 4/6] fix: move /usr/etc/* to /etc --- Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Containerfile b/Containerfile index b5eb791e..2197daba 100644 --- a/Containerfile +++ b/Containerfile @@ -40,4 +40,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp +RUN mv /usr/etc/* /etc/ + RUN bootc container lint From 88156a132f97449ba0520ad6531ad4d9005b6637 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 18:20:39 +0000 Subject: [PATCH 5/6] fix: just delete the dir --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 2197daba..ebab892c 100644 --- a/Containerfile +++ b/Containerfile @@ -40,6 +40,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp -RUN mv /usr/etc/* /etc/ +RUN rm -rf /usr/etc RUN bootc container lint From f12abb891ba0b303688e442469bc0597ac188936 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 21 Jan 2025 23:11:02 +0000 Subject: [PATCH 6/6] fix: force composefs --- sys_files/usr/lib/ostree/prepare-root.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sys_files/usr/lib/ostree/prepare-root.conf diff --git a/sys_files/usr/lib/ostree/prepare-root.conf b/sys_files/usr/lib/ostree/prepare-root.conf new file mode 100644 index 00000000..2a1ed6bc --- /dev/null +++ b/sys_files/usr/lib/ostree/prepare-root.conf @@ -0,0 +1,5 @@ +[composefs] +enabled = yes + +[sysroot] +readonly = true