ocpver

Author: omertuc

Containerfile

@@ -10,11 +10,12 @@ RUN mkdir -p /build/target/dev-rootfs  # This can hold arbitrary extra content
 RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar /out
 RUN mkdir -p /build/target/dev-rootfs  # This can hold arbitrary extra content
 
-FROM quay.io/otuchfel/bootc:seed2 as seed
+FROM quay.io/otuchfel/bootc:seed30 as seed
 
 # ____________________________________________________________________________
 
-FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b1124faf4b73753b4679085604dd8cb810c4a7a2e659978f5c80183bb165f94
+FROM quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66b5f9d8f1af5acee783db84a25c08338252ff9c276d33e391680168a22f42ee
+
 
 LABEL com.openshift.lifecycle-agent.seed_format_version=4
 

build_seed.sh

@@ -7,5 +7,5 @@ set -euxo pipefail
 cd $SCRIPT_DIR
 
 podman build -t bootcseed -f Containerfile .
-podman tag bootcseed:latest quay.io/otuchfel/bootc:seed6
-podman push quay.io/otuchfel/bootc:seed6
+podman tag bootcseed:latest quay.io/otuchfel/bootc:seed61
+podman push quay.io/otuchfel/bootc:seed61

lib/src/install.rs

@@ -1112,8 +1112,8 @@ fn ensure_var() -> Result<()> {
 /// will traverse the link.
 #[context("Linking tmp mounts to host")]
 pub(crate) fn setup_tmp_mounts() -> Result<()> {
-    let slash_tmp_statfs = rustix::fs::statfs("/tmp")?;
-    if slash_tmp_statfs.f_type == libc::TMPFS_MAGIC {
+    let st = rustix::fs::statfs("/tmp")?;
+    if st.f_type == libc::TMPFS_MAGIC {
         tracing::trace!("Already have tmpfs /tmp")
     } else {
         // Note we explicitly also don't want a "nosuid" tmp, because that