Merge branch 'main' into cleanup/secureboot

gardenlinux · Sep 11, 2024 · 2b3aaff · 2b3aaff
2 parents ebc60e8 + e2dff54
commit 2b3aaff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml
@@ -32,6 +32,6 @@ jobs:
 
       - id: ShellCheck
         name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@b8c7b83d16cce15d13563f5d055b34b9e3360ed3 # pin@aa647ec4466543e8555c2c3b648124a9813cee44
+        uses: redhat-plumbers-in-action/differential-shellcheck@cc6721c45a8800cc666de45493545a07a638d121 # pin@aa647ec4466543e8555c2c3b648124a9813cee44
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/builder/image.manifest b/builder/image.manifest
@@ -6,8 +6,12 @@ chroot_dir="$(mktemp -d)"
 mount -t tmpfs tmpfs "$chroot_dir"
 tar --extract --xattrs --xattrs-include '*' --directory "$chroot_dir" < "$1"
 
+mount --rbind --make-rslave /proc "$chroot_dir/proc"
+
 #shellcheck disable=SC2016
 chroot "$chroot_dir" dpkg-query --show --showformat='${binary:Package} ${Version}\n' > "$2"
 
+umount -l "$chroot_dir/proc"
+
 umount "$chroot_dir"
 rmdir "$chroot_dir"