From 928b15fa7f45cef5761916ab40eab9503f7da92e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 19 Nov 2024 15:28:08 +0100 Subject: [PATCH 1/2] sysext.just: List each extracted packages on its own line This makes the log more readable in CI. --- sysext.just | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sysext.just b/sysext.just index 14f45d7..2279b4a 100644 --- a/sysext.just +++ b/sysext.just @@ -198,12 +198,11 @@ install-rpms: cd rootfs - echo "📦 Extracting packages" + echo "📦 Extracting packages:" for rpm in ../rpms/*.rpm; do - echo -n "$(basename ${rpm}) " + echo "$(basename ${rpm})" rpm2cpio "${rpm}" | ${SUDO} cpio -idmv &> /dev/null done - echo "" # Install files from the current directory. Uses: # - files: List of folders or files to copy to `rootfs`. Use either `usr` or From b1c04ddbe30c1db8d2193fb4bb0ea2abbd16f26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 19 Nov 2024 15:28:51 +0100 Subject: [PATCH 2/2] sysext.just: Move /run out of the sysext (ignored) /run is ignored so let's move it out of the sysext. --- sysext.just | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysext.just b/sysext.just index 2279b4a..a4ba7b1 100644 --- a/sysext.just +++ b/sysext.just @@ -258,7 +258,7 @@ move-etc: fi # Move all folders outside of /usr & /opt out of the sysext's rootfs. -# Note: This step is still in progress. Currently only moves /var. +# Note: This step is still in progress. Currently only moves /var and /run. rm-ignored: #!/bin/bash set -euo pipefail @@ -278,7 +278,7 @@ rm-ignored: cd rootfs - for dir in "var" "etc"; do + for dir in "var" "run"; do if [[ -d ./"${dir}" ]] then echo "➡️ Moving ${dir} out of rootfs" ${SUDO} mv ./"${dir}" ../rootfs.ignored