Skip to content

Commit d83dffc

Browse files
committed
WIP
1 parent 344a187 commit d83dffc

File tree

8 files changed

+22
-7
lines changed

8 files changed

+22
-7
lines changed

examples/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ bootc-uki/extra-fcos/usr/bin/bootc
1010
bootc-uki/extra-fcos/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup
1111
bootc-uki/extra/usr/bin/bootc
1212
bootc-uki/extra/usr/lib/dracut/modules.d/37bootc/bootc-initramfs-setup
13+
bootc-uki/iid
1314
bootc-uki/secureboot/
15+
bootc-uki/tmp
1416
systemd-bootx64.efi

examples/bootc-bls/build-fcos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export FROM="${IMAGE:-quay.io/fedora/fedora-coreos:stable}"
4-
export TAG="${IMAGE:-quay.io/fedora/fedora-coreos-bls:stable}"
3+
export FROM="quay.io/fedora/fedora-coreos:stable"
4+
export TAG="quay.io/fedora/fedora-coreos-bls:stable"
55
export EXTRA="extra-fcos"
66
exec ./build

examples/bootc-uki/build.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ podman build \
2020
--from "${FROM}" \
2121
-t "${TAG}" \
2222
-f Containerfile.stage1 \
23-
--iidfile=tmp/iid \
23+
--iidfile=iid \
2424
"${EXTRA}"

examples/bootc-uki/build.final

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mount /dev/vdb3 tmp
1616
# rm -rf tmp/sysroot
1717
mkdir -p tmp/sysroot/composefs
1818

19-
IMAGE_ID="$(sed s/sha256:// tmp/iid)"
19+
IMAGE_ID="$(sed s/sha256:// iid)"
2020
./bootc internals cfs --repo tmp/sysroot/composefs oci pull containers-storage:"${IMAGE_ID}"
2121
COMPOSEFS_FSVERITY="$(./bootc internals cfs --repo tmp/sysroot/composefs oci compute-id --bootable "${IMAGE_ID}")"
2222

examples/to-disk-fcos.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -euxo pipefail
4+
5+
export IMAGE="quay.io/fedora/fedora-coreos-bls:stable"
6+
exec ./to-disk.sh

examples/to-disk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
set -euxo pipefail
44

5+
IMAGE="${IMAGE:-quay.io/fedora/fedora-bootc-bls:42}"
6+
57
bootc_project="/srv/bootc"
6-
IMAGE="quay.io/fedora/fedora-bootc-bls:42"
78

89
if [[ "$PWD" != "$bootc_project/examples" ]]; then
910
echo "Run this command from $bootc_project/examples"
@@ -15,7 +16,6 @@ if [[ ! -f systemd-bootx64.efi ]]; then
1516
exit 1
1617
fi
1718

18-
rm -rf ./test.img
1919
rm -rf ./test.img
2020
truncate -s 15G test.img
2121

examples/to-filesystem-fcos.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -euxo pipefail
4+
5+
export IMAGE="quay.io/fedora/fedora-coreos-uki:stable"
6+
exec ./to-filesystem.sh

examples/to-filesystem.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
set -euxo pipefail
44

5+
IMAGE="${IMAGE:-quay.io/fedora/fedora-bootc-bls:42}"
6+
57
bootc_project="/srv/bootc"
6-
IMAGE="quay.io/fedora/fedora-bootc-bls:42"
78

89
if [[ "$PWD" != "$bootc_project/examples" ]]; then
910
echo "Run this command from $bootc_project/examples"

0 commit comments

Comments
 (0)