rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-06-25 14:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to customize GRUB menu entry, apply grub menu copy also to prepare_arm_images.sh

Browse Source 
Signed-off-by: mudler <mudler@mocaccino.org>
This commit is contained in:
mudler 2023-05-31 10:56:49 +02:00
parent cd8dd27354
commit 411b9404ef
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools-image/build-arm-image.sh
View File

@ -16,6 +16,7 @@ load_vars() {
oem_size="${OEM_SIZE:-64}" oem_size="${OEM_SIZE:-64}"
recovery_size="${RECOVERY_SIZE:-2192}" recovery_size="${RECOVERY_SIZE:-2192}"
default_active_size="${DEFAULT_ACTIVE_SIZE:-2400}" default_active_size="${DEFAULT_ACTIVE_SIZE:-2400}"
menu_entry="${DEFAULT_MENU_ENTRY:-Kairos}"
## Repositories ## Repositories
final_repo="${FINAL_REPO:-quay.io/costoolkit/releases-teal-arm64}" final_repo="${FINAL_REPO:-quay.io/costoolkit/releases-teal-arm64}"
@ -422,7 +423,7 @@ mkdir -p $WORKDIR/persistent/cloud-config
cp -rfv /defaults.yaml $WORKDIR/persistent/cloud-config/01_defaults.yaml cp -rfv /defaults.yaml $WORKDIR/persistent/cloud-config/01_defaults.yaml
grub2-editenv $WORKDIR/state/grub_oem_env set "default_menu_entry=Kairos" grub2-editenv $WORKDIR/state/grub_oem_env set "default_menu_entry=$menu_entry"
# We copy the file we saved earier to the STATE partition # We copy the file we saved earier to the STATE partition
cp -rfv "${tmpgrubconfig}" $WORKDIR/state/grubmenu cp -rfv "${tmpgrubconfig}" $WORKDIR/state/grubmenu

12
tools-image/prepare_arm_images.sh
View File

@ -20,6 +20,7 @@ size="${SIZE:-7544}"
state_size="${STATE_SIZE:-4992}" state_size="${STATE_SIZE:-4992}"
recovery_size="${RECOVERY_SIZE:-2192}" recovery_size="${RECOVERY_SIZE:-2192}"
default_active_size="${DEFAULT_ACTIVE_SIZE:-2400}" default_active_size="${DEFAULT_ACTIVE_SIZE:-2400}"
menu_entry="${DEFAULT_MENU_ENTRY:-Kairos}"
container_image="${container_image:-quay.io/kairos/kairos-opensuse-leap-arm-rpi:v1.5.1-k3sv1.25.6-k3s1}" container_image="${container_image:-quay.io/kairos/kairos-opensuse-leap-arm-rpi:v1.5.1-k3sv1.25.6-k3s1}"
@ -67,6 +68,11 @@ else
rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${directory}/ $TARGET rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${directory}/ $TARGET
fi fi
# We copy the grubmenu.cfg to a temporary location to be copied later in the state partition
# This is a hack and we need a better way: https://github.com/kairos-io/kairos/issues/1427
tmpgrubconfig=$(mktemp /tmp/grubmeny.cfg.XXXXXX)
cp -rfv $TARGET/etc/kairos/branding/grubmenu.cfg "${tmpgrubconfig}"
umount $TARGET umount $TARGET
sync sync
@ -106,7 +112,11 @@ LOOP=$(losetup --show -f state_partition.img)
mkdir -p $WORKDIR/state mkdir -p $WORKDIR/state
mount $LOOP $WORKDIR/state mount $LOOP $WORKDIR/state
cp -arf $STATEDIR/* $WORKDIR/state cp -arf $STATEDIR/* $WORKDIR/state
grub2-editenv $WORKDIR/state/grub_oem_env set "default_menu_entry=Kairos" grub2-editenv $WORKDIR/state/grub_oem_env set "default_menu_entry=$menu_entry"
# We copy the file we saved earier to the STATE partition
cp -rfv "${tmpgrubconfig}" $WORKDIR/state/grubmenu
umount $WORKDIR/state umount $WORKDIR/state
losetup -d $LOOP losetup -d $LOOP