Skip to content

run_qemu.sh: refactor loader.conf logic to disable and append #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marc-hb merged 1 commit into from
Apr 28, 2025
Merged

run_qemu.sh: refactor loader.conf logic to disable and append #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions run_qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,13 +932,25 @@ update_rootfs_boot_kernel()
sudo cp "$builddir/mkosi.extra/boot/vmlinuz-$kver" "$builddir/mnt/run-qemu-kernel/$kver/vmlinuz"

defconf="$builddir/mnt/loader/loader.conf"
local loader_timeout=4

# mkosi->"bootctl install ..." creates a stub loader.conf.
# It can also come from a previous run of this script.
if [ -f "$defconf" ]; then
sudo sed -i -e 's/^#.*timeout.*/timeout 4/' "$defconf"
sudo sed -i -e '/default.*/d' "$defconf"
else
echo "timeout 4" | sudo tee "$defconf"
# Comment out existing values. Last value seems to win but it's not
# documented in "man loader.conf" so let's not rely on it
sudo sed -i -e 's/^[[:blank:]]*timeout\(.*\)/# timeout \1/' "$defconf"
sudo sed -i -e 's/^[[:blank:]]*default\(.*\)/# default \1/' "$defconf"
fi
echo "default run-qemu-kernel-$kver.conf" | sudo tee -a "$defconf"

{
generatedfrom_header "update_rootfs_boot_kernel() >> $defconf"
cat <<EOF
timeout $loader_timeout
default run-qemu-kernel-$kver.conf

EOF
} | sudo tee -a "$defconf"

[[ "$_arg_legacy_bios" == 'on' ]] || install_opt_efi_shell

Expand Down