keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

grub: Fix selection of default item

Browse Source 
1. Didn't work before because the variable was not exported.
2. Fixed the logic broken by the introduction of support for saving
the selected item on the FAT partition.
This commit is contained in:
Anton Midyukov 2021-05-20 23:55:28 +07:00
parent 366f6a6ba5
commit 8f01688b34
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features.in/grub/cfg.in/00defaults.cfg
View File

@ -14,7 +14,7 @@ if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv load_env --file $pfxfat/grubenv
set default="${saved_entry}" set default="${saved_entry}"
else else
default=@default_id@ set default=@default_id@
fi fi
function savedefault { function savedefault {
if [ -z "${boot_once}" -a -s $pfxfat/grubenv ]; then if [ -z "${boot_once}" -a -s $pfxfat/grubenv ]; then

1
features.in/grub/config.mk
View File

@ -9,6 +9,7 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call try,BOOTVGA,normal) @$(call try,BOOTVGA,normal)
endif endif
@$(call set,RELNAME,ALT ($(IMAGE_NAME))) @$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call xport,GRUB_DEFAULT)
# UI is overwritten # UI is overwritten
use/grub/ui/%: use/grub use/grub/ui/%: use/grub

17
features.in/grub/stage1/scripts.d/01-grub
View File

@ -29,25 +29,20 @@ local CFG=$1
if [ -n "$GLOBAL_GRUB_DEFAULT" ]; then if [ -n "$GLOBAL_GRUB_DEFAULT" ]; then
if [ -n "$(grep -i "$GLOBAL_GRUB_DEFAULT" "$CFG")" ]; then if [ -n "$(grep -i "$GLOBAL_GRUB_DEFAULT" "$CFG")" ]; then
DEFAULT="$GLOBAL_GRUB_DEFAULT" DEFAULT="$GLOBAL_GRUB_DEFAULT"
sed -i '/^default/d'
echo "default=$DEFAULT" >> "$CFG"
else else
echo "error: $GLOBAL_GRUB_DEFAULT missing in $CFG" >&2 echo "error: $GLOBAL_GRUB_DEFAULT missing in $CFG" >&2
exit 1 exit 1
fi fi
fi elif [ -n "$(grep -i "--id 'linux'" "$CFG")" ]; then
DEFAULT="$(grep -i '\-\-id ' "$CFG" | head -1 | rev| cut -f2 -d' ' |rev)" DEFAULT=linux
if grep -i '@default_id@' "$CFG"; then else
sed -i "s/@default_id@/$DEFAULT/" "$CFG" DEFAULT="$(grep -i '\-\-id ' "$CFG" | head -1 | rev| cut -f2 -d' ' |rev)"
fi if [ -z "$DEFAULT" ]; then
if ! grep -i '^\s*\(set\s\+\)\?default=' "$CFG"; then
if [ -n "$DEFAULT" ]; then
echo "default=$DEFAULT" >> "$CFG"
else
echo "error: no DEFAULT or UI directive and cannot guess for $CFG" >&2 echo "error: no DEFAULT or UI directive and cannot guess for $CFG" >&2
exit 1 exit 1
fi fi
fi fi
sed -i "s/@default_id@/$DEFAULT/" "$CFG"
} }
default_change "$CFG" default_change "$CFG"