mkosi-obs: use --force also for unzstd

Otherwise it will ask interactively whether to overwrite a file, which doesn't
work for unattended builds and gets them stuck

diff --git a/mkosi/resources/mkosi-obs/mkosi.build b/mkosi/resources/mkosi-obs/mkosi.build
index c73366fed38d7ea8c43533db86510fa88a1b29ac..8ae619e902a5359b0d93648e76b0ac10db3a63a0 100755 (executable)
--- a/mkosi/resources/mkosi-obs/mkosi.build
+++ b/mkosi/resources/mkosi-obs/mkosi.build
@@ -64,7 +64,7 @@ while read -r SIG; do
     # If there is a DDI with an ESP, add the UKI to it
     if [ -f "${DEST%efi}raw" ] || [ -f "${DEST%efi}raw.zst" ] || [ -f "${DEST%efi}img" ] || [ -f "${DEST%efi}img.zst" ]; then
         if [ -f "${DEST%efi}raw.zst" ] || [ -f "${DEST%efi}img.zst" ]; then
-            unzstd "${DEST%efi}"raw*.zst
+            unzstd --force "${DEST%efi}"raw*.zst
             rm -f "${DEST%efi}"raw*.zst
             recompress=1
         else
@@ -100,7 +100,7 @@ while read -r BOOTLOADER; do
     dest="${dest%.sig}"
 
     if [ -f "${ddi}.zst" ]; then
-        unzstd "${ddi}.zst"
+        unzstd --force "${ddi}.zst"
     fi
 
     offset="$(systemd-repart --json=short "$ddi" | jq -r '.[] | select(.type == "esp") | .offset')"
@@ -187,7 +187,7 @@ while read -r SIG; do
     rm -f "$OUTPUTDIR/$(basename "${SIG%roothash.sig}repart.tar")"
     if [ -f "$OUTPUTDIR/$(basename "${SIG%roothash.sig}raw.zst")" ] || [ -f "$OUTPUTDIR/$(basename "${SIG%roothash.sig}img.zst")" ]; then
         recompress=1
-        unzstd "$OUTPUTDIR/$(basename "${SIG%roothash.sig}")"raw*.zst
+        unzstd --force "$OUTPUTDIR/$(basename "${SIG%roothash.sig}")"raw*.zst
         rm -f "$OUTPUTDIR/$(basename "${SIG%roothash.sig}")"raw*.zst
     else
         recompress=0
@@ -259,7 +259,7 @@ if (( ${#AUTHVARS[@]} > 0 )); then
         [[ "$ddi" =~ -verity ]] && continue
 
         if [[ $ddi == *.zst ]]; then
-            unzstd "${ddi}"
+            unzstd --force "${ddi}"
             recompress=1
         else
             recompress=0

diff --git a/mkosi/resources/mkosi-obs/mkosi.postoutput b/mkosi/resources/mkosi-obs/mkosi.postoutput
index 65c4000a7c30c84f8f8684cb8a349265822fc657..823ad6351abebf9d4c1c500ff36396749458a5a5 100755 (executable)
--- a/mkosi/resources/mkosi-obs/mkosi.postoutput
+++ b/mkosi/resources/mkosi-obs/mkosi.postoutput
@@ -78,7 +78,7 @@ for ddi in "${DDIS[@]}"; do
     [[ "$ddi" =~ -verity ]] && continue
 
     if [[ $ddi == *.zst ]]; then
-        unzstd "${ddi}"
+        unzstd --force "${ddi}"
     fi
     offset="$(systemd-repart --json=short "${ddi%.zst}" | jq -r '.[] | select(.type == "esp") | .offset')"
     if [ "$offset" = "null" ]; then