Updated savedefault patch
PATCH 1/1 Updated savedefault patch
This is an updated version of Vladimir's savedefault patch in
http://lists.gnu.org/archive/html/grub-devel/2009-06/msg00002.html. I think I've taken into account the feedback offered there. It depends on my recent save_env patch
(http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00038.html).
I realise that Robert already said that this was post-1.97 material, but I'd like to see if we can agree on this in advance.
Still to do: update grub-set-default to use this (obvious, I think); implement 'savedefault --once' and grub-reboot (useful when you want to tell the boot loader to boot something else just once, but then return to the previous default; consider unattended scenarios).
2009-09-02 Vladimir Serbinenko <[email protected]> 2009-09-02 Colin Watson <[email protected]>
* normal/menu.c (grub_menu_execute_entry): Save selected entry title in `chosen_entry' environment variable.
* normal/menu_text.c (get_entry_number): Check if the variable matches the title of a menu entry.
(run_menu): Pass menu to get_entry_number.
* util/grub-mkconfig_lib.in (save_default_entry): New function.
* util/grub.d/00_header.in: If GRUB_DEFAULT is saved', set default to ${saved_entry}'. Load environment on initialisation.
* util/grub.d/10_freebsd.in: Call save_default_entry.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_linux.in (linux_entry): Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/i386/pc/grub-install.in: Create environment block.
* util/i386/efi/grub-install.in: Likewise.
* util/ieee1275/grub-install.in: Likewise.
* util/sparc64/ieee1275/grub-install.in: Likewise.
menu.c +2 -0
@@ -137,6 +137,8 @@return ; } +grub_env_set ("chosen_entry" , entry->title); +grub_parser_execute ((char *) entry->sourcecode);if (grub_errno ==GRUB_ERR_NONE &&grub_loader_is_loaded ())
menu_text.c +24 -2
@@ -237,7 +237,7 @@/* Get the entry number from the variable NAME. */ static int -get_entry_number (const char *name) +get_entry_number (grub_menu_t menu,const char *name) {char *val;int entry;
@@ -250,6 +250,28 @@ entry = (int )grub_strtoul (val,0 ,0 ); +if (grub_errno ==GRUB_ERR_BAD_NUMBER ) + { +/* See if the variable matches the title of a menu entry. */ +grub_menu_entry_t e = menu->entry_list; +int i; + + grub_errno =GRUB_ERR_NONE ; + +for (i =0 ; e; i++) + { +if (grub_strcmp (e->title, val) ==0 ) + { + entry = i; +break ; + } + e = e->next; + } + +if (! e) + entry =-1 ; + } +if (grub_errno !=GRUB_ERR_NONE ) { grub_errno =GRUB_ERR_NONE ;
@@ -291,7 +313,7 @@ first =0 ; - default_entry =get_entry_number ("default" ); + default_entry =get_entry_number (menu,"default" );/* If DEFAULT_ENTRY is not within the menu entries, fall back to the first entry. */
grub-mkconfig_lib.in +7 -0
@@ -130,6 +130,13 @@ echo ${drive}${relative_path} } +save_default_entry () +{ + if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then + echo 'save_env saved_entry=${chosen_entry}' + fi +} + prepare_grub_to_access_device () { device=$1
grub.d/10_freebsd.in +1 -0
@@ -58,6 +58,7 @@ cat << EOF menuentry "${OS}" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF freebsd ${kfreebsd_rel_dirname}/${kfreebsd_basename}
grub.d/10_windows.in +1 -0
@@ -73,6 +73,7 @@ menuentry "$OS" { EOF + save_default_entry | sed -e 's,^,\t,' prepare_grub_to_access_device "$dev" | sed 's,^,\t,' cat << EOF
grub.d/30_os-prober.in +3 -0
@@ -55,6 +55,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
@@ -85,6 +86,7 @@ cat << EOF menuentry "${LLABEL} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF linux ${LKERNEL} ${LPARAMS}
@@ -104,6 +106,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF insmod vbe
grub.d/10_linux.in +1 -0
@@ -47,6 +47,7 @@ cat << EOF menuentry "$1" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro $2
grub.d/10_hurd.in +1 -0
@@ -71,6 +71,7 @@ cat << EOF menuentry "${OS}" { EOF +save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" cat << EOF multiboot ${kernel} root=device:${GRUB_DEVICE}
grub.d/00_header.in +2 -0
@@ -32,10 +32,12 @@ done if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi +if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi cat << EOF +load_env set default=${GRUB_DEFAULT} EOF
i386/pc/grub-install.in +5 -0
@@ -39,6 +39,7 @@ fi grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -247,6 +248,10 @@ done fi +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
i386/efi/grub-install.in +5 -0
@@ -34,6 +34,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -178,6 +179,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = xfat; then :; else
ieee1275/grub-install.in +5 -0
@@ -37,6 +37,7 @@ grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -163,6 +164,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = x -a "x$modules" = x; then
sparc64/ieee1275/grub-install.in +5 -0
@@ -35,6 +35,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -206,6 +207,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
Thanks,
Signature · 1 line
Colin Watson [[email protected]]
Quoted 4 lines · Colin Watson
Still to do: update grub-set-default to use this (obvious, I think); implement 'savedefault --once' and grub-reboot (useful when you want to tell the boot loader to boot something else just once, but then return to the previous default; consider unattended scenarios).
Here's an update that includes these utilities too. I also shortened the "chosen_entry" environment variable to simply "chosen"; might as well save six bytes of kernel size ...
2009-09-03 Vladimir Serbinenko <[email protected]> 2009-09-03 Colin Watson <[email protected]>
* normal/menu.c (grub_menu_execute_entry): Save selected entry title in `chosen' environment variable.
* normal/menu_text.c (get_entry_number): Check if the variable matches the title of a menu entry.
(run_menu): Pass menu to get_entry_number.
* util/grub-reboot.in: New file.
* util/grub-set-default.in: New file.
* conf/common.rmk (grub-reboot): New utility. (grub-set-default): New utility.
* util/grub-mkconfig_lib.in (save_default_entry): New function.
* util/grub.d/00_header.in: If GRUB_DEFAULT is saved', set default to ${saved_entry}'. If ${prev_saved_entry}' is non-empty, move it to saved_entry' for the next boot. Load environment on initialisation.
* util/grub.d/10_freebsd.in: Call save_default_entry.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_linux.in (linux_entry): Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/i386/pc/grub-install.in: Create environment block.
* util/i386/efi/grub-install.in: Likewise.
* util/ieee1275/grub-install.in: Likewise.
* util/sparc64/ieee1275/grub-install.in: Likewise.
menu.c +2 -0
@@ -137,6 +137,8 @@return ; } +grub_env_set ("chosen" , entry->title); +grub_parser_execute ((char *) entry->sourcecode);if (grub_errno ==GRUB_ERR_NONE &&grub_loader_is_loaded ())
menu_text.c +24 -2
@@ -237,7 +237,7 @@/* Get the entry number from the variable NAME. */ static int -get_entry_number (const char *name) +get_entry_number (grub_menu_t menu,const char *name) {char *val;int entry;
@@ -250,6 +250,28 @@ entry = (int )grub_strtoul (val,0 ,0 ); +if (grub_errno ==GRUB_ERR_BAD_NUMBER ) + { +/* See if the variable matches the title of a menu entry. */ +grub_menu_entry_t e = menu->entry_list; +int i; + + grub_errno =GRUB_ERR_NONE ; + +for (i =0 ; e; i++) + { +if (grub_strcmp (e->title, val) ==0 ) + { + entry = i; +break ; + } + e = e->next; + } + +if (! e) + entry =-1 ; + } +if (grub_errno !=GRUB_ERR_NONE ) { grub_errno =GRUB_ERR_NONE ;
@@ -291,7 +313,7 @@ first =0 ; - default_entry =get_entry_number ("default" ); + default_entry =get_entry_number (menu,"default" );/* If DEFAULT_ENTRY is not within the menu entries, fall back to the first entry. */
grub-mkconfig_lib.in +7 -0
@@ -130,6 +130,13 @@ echo ${drive}${relative_path} } +save_default_entry () +{ + if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then + echo 'save_env saved_entry=${chosen}' + fi +} + prepare_grub_to_access_device () { device=$1
grub-reboot.in +104 -0
104 lines not on this page · raw message
grub-set-default.in +99 -0
99 lines not on this page · raw message
grub.d/10_freebsd.in +1 -0
@@ -58,6 +58,7 @@ cat << EOF menuentry "${OS}" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF freebsd ${kfreebsd_rel_dirname}/${kfreebsd_basename}
grub.d/10_windows.in +1 -0
@@ -73,6 +73,7 @@ menuentry "$OS" { EOF + save_default_entry | sed -e 's,^,\t,' prepare_grub_to_access_device "$dev" | sed 's,^,\t,' cat << EOF
grub.d/30_os-prober.in +3 -0
@@ -55,6 +55,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
@@ -85,6 +86,7 @@ cat << EOF menuentry "${LLABEL} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF linux ${LKERNEL} ${LPARAMS}
@@ -104,6 +106,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF insmod vbe
grub.d/10_linux.in +1 -0
@@ -47,6 +47,7 @@ cat << EOF menuentry "$1" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro $2
grub.d/10_hurd.in +1 -0
@@ -71,6 +71,7 @@ cat << EOF menuentry "${OS}" { EOF +save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" cat << EOF multiboot ${kernel} root=device:${GRUB_DEVICE}
grub.d/00_header.in +6 -0
@@ -32,11 +32,17 @@ done if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi +if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi cat << EOF +load_env set default=${GRUB_DEFAULT} +if [ \${prev_saved_entry} ]; then + save_env saved_entry=\${prev_saved_entry} + save_env prev_saved_entry= +fi EOF case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
i386/pc/grub-install.in +5 -0
@@ -39,6 +39,7 @@ fi grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -247,6 +248,10 @@ done fi +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
i386/efi/grub-install.in +5 -0
@@ -34,6 +34,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -178,6 +179,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = xfat; then :; else
ieee1275/grub-install.in +5 -0
@@ -37,6 +37,7 @@ grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -163,6 +164,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = x -a "x$modules" = x; then
sparc64/ieee1275/grub-install.in +5 -0
@@ -35,6 +35,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -206,6 +207,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
common.rmk +14 -0
@@ -175,6 +175,20 @@ sbin_SCRIPTS += grub-dumpbios CLEANFILES += grub-dumpbios +# For grub-set-default. +grub-set-default: util/grub-set-default.in config.status + ./config.status --file=$@:$< + chmod +x $@ +sbin_SCRIPTS += grub-set-default +CLEANFILES += grub-set-default + +# For grub-reboot. +grub-reboot: util/grub-reboot.in config.status + ./config.status --file=$@:$< + chmod +x $@ +sbin_SCRIPTS += grub-reboot +CLEANFILES += grub-reboot + # Filing systems. pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \ ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
Signature · 1 line
Colin Watson [[email protected]]
Quoted 3 lines · Colin Watson
I realise that Robert already said that this was post-1.97 material, but I'd like to see if we can agree on this in advance.
This patch looks sane to me. I'm afraid I can't fully commit to it (specially since noone else has commented yet), but if you start using this, we will be reasonable about it when the time comes.
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 7 lines · Robert Millan
Quoted 2 lines · Colin Watson
I realise that Robert already said that this was post-1.97 material, but I'd like to see if we can agree on this in advance.
This patch looks sane to me. I'm afraid I can't fully commit to it (specially since noone else has commented yet), but if you start using this, we will be reasonable about it when the time comes.
Thanks.
Here's a patch that doesn't depend on the save_env change. The previous ChangeLog entry in this thread should still be adequate.
common.rmk +14 -0
@@ -175,6 +175,20 @@ sbin_SCRIPTS += grub-dumpbios CLEANFILES += grub-dumpbios +# For grub-set-default. +grub-set-default: util/grub-set-default.in config.status + ./config.status --file=$@:$< + chmod +x $@ +sbin_SCRIPTS += grub-set-default +CLEANFILES += grub-set-default + +# For grub-reboot. +grub-reboot: util/grub-reboot.in config.status + ./config.status --file=$@:$< + chmod +x $@ +sbin_SCRIPTS += grub-reboot +CLEANFILES += grub-reboot + # Filing systems. pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \ ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
menu.c +2 -0
@@ -137,6 +137,8 @@return ; } +grub_env_set ("chosen" , entry->title); +grub_parser_execute ((char *) entry->sourcecode);if (grub_errno ==GRUB_ERR_NONE &&grub_loader_is_loaded ())
menu_text.c +24 -2
@@ -237,7 +237,7 @@/* Get the entry number from the variable NAME. */ static int -get_entry_number (const char *name) +get_entry_number (grub_menu_t menu,const char *name) {char *val;int entry;
@@ -250,6 +250,28 @@ entry = (int )grub_strtoul (val,0 ,0 ); +if (grub_errno ==GRUB_ERR_BAD_NUMBER ) + { +/* See if the variable matches the title of a menu entry. */ +grub_menu_entry_t e = menu->entry_list; +int i; + + grub_errno =GRUB_ERR_NONE ; + +for (i =0 ; e; i++) + { +if (grub_strcmp (e->title, val) ==0 ) + { + entry = i; +break ; + } + e = e->next; + } + +if (! e) + entry =-1 ; + } +if (grub_errno !=GRUB_ERR_NONE ) { grub_errno =GRUB_ERR_NONE ;
@@ -291,7 +313,7 @@ first =0 ; - default_entry =get_entry_number ("default" ); + default_entry =get_entry_number (menu,"default" );/* If DEFAULT_ENTRY is not within the menu entries, fall back to the first entry. */
grub.d/10_freebsd.in +1 -0
@@ -58,6 +58,7 @@ cat << EOF menuentry "${OS}" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF freebsd ${kfreebsd_rel_dirname}/${kfreebsd_basename}
grub.d/10_windows.in +1 -0
@@ -73,6 +73,7 @@ menuentry "$OS" { EOF + save_default_entry | sed -e 's,^,\t,' prepare_grub_to_access_device "$dev" | sed 's,^,\t,' cat << EOF
grub.d/30_os-prober.in +3 -0
@@ -55,6 +55,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
@@ -85,6 +86,7 @@ cat << EOF menuentry "${LLABEL} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF linux ${LKERNEL} ${LPARAMS}
@@ -104,6 +106,7 @@ cat << EOF menuentry "${LONGNAME} (on ${DEVICE})" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" cat << EOF insmod vbe
grub.d/10_linux.in +1 -0
@@ -47,6 +47,7 @@ cat << EOF menuentry "$1" { EOF + save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/" cat << EOF linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro $2
grub.d/10_hurd.in +1 -0
@@ -71,6 +71,7 @@ cat << EOF menuentry "${OS}" { EOF +save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" cat << EOF multiboot ${kernel} root=device:${GRUB_DEVICE}
grub.d/00_header.in +8 -0
@@ -32,11 +32,19 @@ done if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi +if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi cat << EOF +load_env set default=${GRUB_DEFAULT} +if [ \${prev_saved_entry} ]; then + saved_entry=\${prev_saved_entry} + save_env saved_entry + prev_saved_entry= + save_env prev_saved_entry +fi EOF case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
sparc64/ieee1275/grub-install.in +5 -0
@@ -35,6 +35,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -206,6 +207,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
grub-set-default.in +99 -0
99 lines not on this page · raw message
grub-mkconfig_lib.in +8 -0
@@ -130,6 +130,14 @@ echo ${drive}${relative_path} } +save_default_entry () +{ + if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then + echo 'saved_entry=${chosen}' + echo 'save_env saved_entry' + fi +} + prepare_grub_to_access_device () { device=$1
ieee1275/grub-install.in +5 -0
@@ -37,6 +37,7 @@ grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -163,6 +164,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = x -a "x$modules" = x; then
i386/pc/grub-install.in +5 -0
@@ -39,6 +39,7 @@ fi grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -247,6 +248,10 @@ done fi +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Write device to a variable so we don't have to traverse /dev every time. grub_device=`$grub_probe --target=device ${grubdir}`
i386/efi/grub-install.in +5 -0
@@ -34,6 +34,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` +grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}` rootdir= grub_prefix=`echo /boot/grub | sed ${transform}` modules=
@@ -178,6 +179,10 @@ cp -f $file ${grubdir} || exit 1 done +if ! test -f ${grubdir}/grubenv; then + $grub_editenv ${grubdir}/grubenv create +fi + # Create the core image. First, auto-detect the filesystem module. fs_module=`$grub_probe --target=fs --device-map=${device_map} ${grubdir}` if test "x$fs_module" = xfat; then :; else
grub-reboot.in +104 -0
104 lines not on this page · raw message
Signature · 1 line
Colin Watson [[email protected]]