Skip to content

Commit a3f44ea

Browse files
allisonkarlitskayacgwalters
authored andcommitted
examples: add a superfluous rm -rf line
I often disable the `rm -rf tmp` line to make iterating quicker (by removing the need to pull and write previous layers and objects) but in order for that to work you still need to delete a couple of things. Add a second line so that you can comment out the first one while you're working, like: # rm -rf tmp rm -rf tmp/efi tmp/sysroot/composefs/images Signed-off-by: Allison Karlitskaya <[email protected]>
1 parent 89ec2a8 commit a3f44ea

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

examples/bls/build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37co
4444
CFSCTL='./cfsctl --repo tmp/sysroot/composefs'
4545

4646
rm -rf tmp
47+
rm -rf tmp/efi tmp/sysroot/composefs/images
4748
mkdir -p tmp/sysroot/composefs
4849

4950
podman build \

examples/uki/build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37co
3030
CFSCTL='./cfsctl --repo tmp/sysroot/composefs'
3131

3232
rm -rf tmp
33+
rm -rf tmp/efi tmp/sysroot/composefs/images
3334
mkdir -p tmp/sysroot/composefs
3435

3536
${PODMAN_BUILD} \

examples/unified-secureboot/build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37co
1919
CFSCTL='./cfsctl --repo tmp/sysroot/composefs'
2020

2121
rm -rf tmp
22+
rm -rf tmp/efi tmp/sysroot/composefs/images
2223
mkdir -p tmp/sysroot/composefs
2324

2425
# See: https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot
@@ -38,7 +39,7 @@ if [[ ! -d "secureboot" ]]; then
3839
fi
3940

4041
# For debugging, add --no-cache to podman command
41-
mkdir tmp/internal-sysroot
42+
mkdir -p tmp/internal-sysroot
4243
podman build \
4344
--iidfile=tmp/iid \
4445
-v "${PWD}/tmp/internal-sysroot:/tmp/sysroot:z,U" \

examples/unified/build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ cp ../../target/release/composefs-setup-root extra/usr/lib/dracut/modules.d/37co
1919
CFSCTL='./cfsctl --repo tmp/sysroot/composefs'
2020

2121
rm -rf tmp
22+
rm -rf tmp/efi tmp/sysroot/composefs/images
2223
mkdir -p tmp/sysroot/composefs
2324

2425
# For debugging, add --no-cache to podman command
25-
mkdir tmp/internal-sysroot
26+
mkdir -p tmp/internal-sysroot
2627
podman build \
2728
--iidfile=tmp/iid \
2829
-v "${PWD}/tmp/internal-sysroot:/tmp/sysroot:z,U" \

0 commit comments

Comments
 (0)