Merge pull request #1547 from cgwalters/workaround-buildinfo

build-sys: Work around #1546

Author: cgwalters

Dockerfile

@@ -93,5 +93,7 @@ fi
 # tests to know we're doing upstream CI.
 touch /usr/lib/.bootc-dev-stamp
 # And test our own linting
+## Workaround for https://github.com/bootc-dev/bootc/issues/1546
+rm -rf /root/buildinfo
 bootc container lint --fatal-warnings
 EORUN

crates/ostree-ext/src/sysroot.rs

@@ -37,13 +37,9 @@ impl SysrootLock {
     /// immediately, a status message will be printed to standard output.
     /// The lock will be unlocked when this object is dropped.
     pub async fn new_from_sysroot(sysroot: &ostree::Sysroot) -> Result<Self> {
-        if sysroot.try_lock()? {
-            return Ok(Self {
-                sysroot: sysroot.clone(),
-                unowned: false,
-            });
-        }
-        async_task_with_spinner("Waiting for sysroot lock...", sysroot.lock_future()).await?;
+        let sysroot_clone = sysroot.clone();
+        let locker = tokio::task::spawn_blocking(move || sysroot_clone.lock());
+        async_task_with_spinner("Waiting for sysroot lock...", locker).await??;
         Ok(Self {
             sysroot: sysroot.clone(),
             unowned: false,

tmt/tests/booted/readonly/030-test-locking-read.nu

@@ -0,0 +1,32 @@
+# Verify we can spawn multiple bootc status at the same time
+use std assert
+use tap.nu
+
+tap begin "concurrent bootc status"
+
+# Fork via systemd-run
+let n = 10
+0..$n | each { |v|
+    # Clean up prior runs
+    systemctl stop $"bootc-status-($v)" | complete
+}
+# Fork off a concurrent bootc status
+0..$n | each { |v|
+    systemd-run --no-block -qr -u $"bootc-status-($v)" bootc status
+}
+
+# Await completion
+0..$n | each { |v|
+    loop {
+        let r = systemctl is-active $"bootc-status-($v)" | complete
+        if $r.exit_code == 0 {
+            break
+        }
+        # check status
+        systemctl status $"bootc-status-($v)" out> /dev/null
+        # Clean it up
+        systemctl reset-failed $"bootc-status-($v)"
+    }
+}
+
+tap ok