vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix ordering and tab indentation of NetBSD boot menu entries.

Browse source
This commit is contained in:
Grégoire Sutre 2012-10-28 11:55:22 +01:00
parent a31b11bd96
commit 03711240c8
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-10-28 Grégoire Sutre <gregoire.sutre@gmail.com>
* util/grub.d/10_netbsd.in: Fix tab indentation and make sure
that /netbsd appears first (when it exists).
2012-10-12 Christoph Junghans <ottxor@gentoo.org> 2012-10-12 Christoph Junghans <ottxor@gentoo.org>
* grub-core/Makefile.am (moddep.lst): Use $(AWK) rather than awk. * grub-core/Makefile.am (moddep.lst): Use $(AWK) rather than awk.

12
util/grub.d/10_netbsd.in
View file

@ -74,13 +74,13 @@ netbsd_load_fs_module ()
fi fi
kmodule_rel=$(make_system_path_relative_to_its_root "$kmodule") || return kmodule_rel=$(make_system_path_relative_to_its_root "$kmodule") || return
prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^, ,' prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^, ,' | sed "s/^/$submenu_indentation/"
case "${loader}" in case "${loader}" in
knetbsd) knetbsd)
printf "$grub_tabknetbsd_module_elf %s\n" "${kmodule_rel}" printf "${grub_tab}knetbsd_module_elf %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
;; ;;
multiboot) multiboot)
printf "$grub_tabmodule %s\n" "${kmodule_rel}" printf "${grub_tab}module %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
;; ;;
esac esac
} }
@ -121,11 +121,11 @@ netbsd_entry ()
printf "%s\n" "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" printf "%s\n" "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
case "${loader}" in case "${loader}" in
knetbsd) knetbsd)
printf "$grub_tabknetbsd %s -r %s %s\n" \ printf "${grub_tab}knetbsd %s -r %s %s\n" \
"${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
;; ;;
multiboot) multiboot)
printf "$grub_tabmultiboot %s %s root=%s %s\n" \ printf "${grub_tab}multiboot %s %s root=%s %s\n" \
"${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/" "${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
;; ;;
esac esac
@ -147,7 +147,7 @@ pattern="^ELF[^,]*executable.*statically linked"
submenu_indentation="" submenu_indentation=""
is_first_entry=true is_first_entry=true
for k in $(ls -t /netbsd*) ; do for k in /netbsd $(ls -t /netbsd?* 2>/dev/null) ; do
if ! grub_file_is_not_garbage "$k" ; then if ! grub_file_is_not_garbage "$k" ; then
continue continue
fi fi