From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 4 Jul 2025 22:31:50 +0000 (+0100)
Subject: ci: use -p and -f when creating dirs/removing files in mkosi job btrfs setup
X-Git-Tag: v258-rc1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a06e64d8847f328b204c65236bf937eeb7831f3d;p=thirdparty%2Fsystemd.git

ci: use -p and -f when creating dirs/removing files in mkosi job btrfs setup

It failed at least once:

mkdir: cannot create directory ‘/mnt/mkosi’: File exists
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index badcfa1daa8..1486ddb6c21 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -128,14 +128,14 @@ jobs:
         run: |
           truncate --size=100G btrfs.raw
           mkfs.btrfs btrfs.raw
-          sudo mkdir /mnt/mkosi
+          sudo mkdir -p /mnt/mkosi
           LOOP="$(sudo losetup --find --show --direct-io=on btrfs.raw)"
-          rm btrfs.raw
+          rm -f btrfs.raw
           sudo mount "$LOOP" /mnt/mkosi --options compress=zstd:1,user_subvol_rm_allowed,noatime,discard=async,space_cache=v2
           sudo chown "$(id -u):$(id -g)" /mnt/mkosi
-          mkdir /mnt/mkosi/tmp
+          mkdir -p /mnt/mkosi/tmp
           echo "TMPDIR=/mnt/mkosi/tmp" >>"$GITHUB_ENV"
-          ln -s /mnt/mkosi/build build
+          ln -sf /mnt/mkosi/build build
 
       - name: Configure
         run: |