|
 |
f96e0b |
From 8109764f605afbc888760e323d19110ccef84e7b Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
|
|
|
f96e0b |
Date: Sun, 28 Oct 2012 11:55:22 +0100
|
|
|
f96e0b |
Subject: [PATCH 054/482] Fix ordering and tab indentation of NetBSD boot menu
|
|
|
f96e0b |
entries.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
util/grub.d/10_netbsd.in | 12 ++++++------
|
|
|
f96e0b |
2 files changed, 11 insertions(+), 6 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index c7b07bb..caea96d 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,8 @@
|
|
|
f96e0b |
+2012-10-28 Grégoire Sutre <gregoire.sutre@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * util/grub.d/10_netbsd.in: Fix tab indentation and make sure
|
|
|
f96e0b |
+ that /netbsd appears first (when it exists).
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2012-10-12 Christoph Junghans <ottxor@gentoo.org>
|
|
|
f96e0b |
|
|
|
f96e0b |
* grub-core/Makefile.am (moddep.lst): Use $(AWK) rather than awk.
|
|
|
f96e0b |
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
|
|
|
f96e0b |
index b76332b..dead5c1 100644
|
|
|
f96e0b |
--- a/util/grub.d/10_netbsd.in
|
|
|
f96e0b |
+++ b/util/grub.d/10_netbsd.in
|
|
|
f96e0b |
@@ -74,13 +74,13 @@ netbsd_load_fs_module ()
|
|
|
f96e0b |
fi
|
|
|
f96e0b |
|
|
|
f96e0b |
kmodule_rel=$(make_system_path_relative_to_its_root "$kmodule") || return
|
|
|
f96e0b |
- prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^, ,'
|
|
|
f96e0b |
+ prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^, ,' | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
case "${loader}" in
|
|
|
f96e0b |
knetbsd)
|
|
|
f96e0b |
- printf "$grub_tabknetbsd_module_elf %s\n" "${kmodule_rel}"
|
|
|
f96e0b |
+ printf "${grub_tab}knetbsd_module_elf %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
;;
|
|
|
f96e0b |
multiboot)
|
|
|
f96e0b |
- printf "$grub_tabmodule %s\n" "${kmodule_rel}"
|
|
|
f96e0b |
+ printf "${grub_tab}module %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
;;
|
|
|
f96e0b |
esac
|
|
|
f96e0b |
}
|
|
|
f96e0b |
@@ -121,11 +121,11 @@ netbsd_entry ()
|
|
|
f96e0b |
printf "%s\n" "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
case "${loader}" in
|
|
|
f96e0b |
knetbsd)
|
|
|
f96e0b |
- printf "$grub_tabknetbsd %s -r %s %s\n" \
|
|
|
f96e0b |
+ printf "${grub_tab}knetbsd %s -r %s %s\n" \
|
|
|
f96e0b |
"${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
;;
|
|
|
f96e0b |
multiboot)
|
|
|
f96e0b |
- printf "$grub_tabmultiboot %s %s root=%s %s\n" \
|
|
|
f96e0b |
+ printf "${grub_tab}multiboot %s %s root=%s %s\n" \
|
|
|
f96e0b |
"${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}" | sed "s/^/$submenu_indentation/"
|
|
|
f96e0b |
;;
|
|
|
f96e0b |
esac
|
|
|
f96e0b |
@@ -147,7 +147,7 @@ pattern="^ELF[^,]*executable.*statically linked"
|
|
|
f96e0b |
submenu_indentation=""
|
|
|
f96e0b |
|
|
|
f96e0b |
is_first_entry=true
|
|
|
f96e0b |
-for k in $(ls -t /netbsd*) ; do
|
|
|
f96e0b |
+for k in /netbsd $(ls -t /netbsd?* 2>/dev/null) ; do
|
|
|
f96e0b |
if ! grub_file_is_not_garbage "$k" ; then
|
|
|
f96e0b |
continue
|
|
|
f96e0b |
fi
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|