Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 19ee771

Browse files
committed
fix bootctl
1 parent bf84b3d commit 19ee771

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

features/ostreeImage/image.ostree.raw

+2-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ mkdir -p $rootfs_work/boot/efi
5656
mount --bind $boot_dir $rootfs_work/boot/efi
5757
mount --rbind /proc $rootfs_work/proc
5858
mount --rbind /sys $rootfs_work/sys
59-
SYSTEMD_ESP_PATH=/boot/efi chroot $rootfs_work bootctl --no-variables install
59+
SYSTEMD_ESP_PATH=/boot/efi chroot $rootfs_work /usr/bin/bootctl --no-variables install
6060
umount -l $rootfs_work/proc
6161
umount -l $rootfs_work/sys
6262
umount $rootfs_work/boot/efi
@@ -72,14 +72,13 @@ root_partition=$(mktemp)
7272
partitions=$(mktemp)
7373

7474
# fixme: make disk size dynamic
75-
truncate -s 600M "$efi_partition"
75+
truncate -s 900M "$efi_partition"
7676
# make_reproducible_vfat $OSTREE_SYSROOT/boot "$efi_partition"
7777
make_reproducible_vfat -t 11111111 $boot_dir "$efi_partition"
7878
size_uefi=$(du -b "$efi_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB) % MB); print (padded_size / MB) }' "MB=1048576")
7979
part_uuid_uefi=b0e0359c-007b-4361-a0d1-a7ca2d73fe3c
8080
echo -e "$part_uuid_uefi\tuefi\t$size_uefi\t0\t$efi_partition\tEFI" >> "$partitions"
8181

82-
8382
truncate -s 3G "$root_partition"
8483
make_reproducible_ext4 -t 11111111 -l ROOT "$MYROOT"/sysroot "$root_partition"
8584
size_rootfs=$(du -b "$root_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB) % MB); print (padded_size / MB) }' "MB=1048576")

features/ostreeImage/pkg.include

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
systemd-boot

0 commit comments

Comments
 (0)