blob: 002bc4c0277a8ff59734898798e9cb540a098795 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
--- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300
+++ b/util/grub.d/10_linux.in 2015-09-27 15:15:26.759140186 -0300
@@ -138,6 +138,13 @@
echo '$(echo "$message" | grub_quote)'
initrd ${rel_dirname}/${initrd}
EOF
+ if test -d "${dirname}/dtb/${version}" ; then
+ # TRANSLATORS: Device tree path isn't identifier. Should be translated.
+ message="$(gettext_printf "Loading devices tree path ...")"
+ sed "s/^/$submenu_indentation/" << EOF
+ echo '$(echo "$message" | grub_quote)'
+ devicetree ${dirname}/dtb/${version}
+EOF
fi
sed "s/^/$submenu_indentation/" << EOF
}
@@ -222,6 +229,10 @@
linux_root_device_thisversion=${GRUB_DEVICE}
fi
+ if test -d "${dirname}/dtb/${version}" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtb/${version}" >&2
+ fi
+
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
--- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300
+++ b/util/grub.d/20_linux_xen.in 2015-09-27 15:15:26.760140194 -0300
@@ -131,6 +131,13 @@
echo '$(echo "$message" | grub_quote)'
module --nounzip ${rel_dirname}/${initrd}
EOF
+ if test -d "${dirname}/dtb/${version}" ; then
+ # TRANSLATORS: Device tree path isn't identifier. Should be translated.
+ message="$(gettext_printf "Loading devices tree path ...")"
+ sed "s/^/$submenu_indentation/" << EOF
+ echo '$(echo "$message" | grub_quote)'
+ devicetree ${dirname}/dtb/${version}
+EOF
fi
sed "s/^/$submenu_indentation/" << EOF
}
@@ -235,6 +242,10 @@
linux_root_device_thisversion=${GRUB_DEVICE}
fi
+ if test -d "${dirname}/dtb/${version}" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtb/${version}" >&2
+ fi
+
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
linux_entry "${OS}" "${version}" "${xen_version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
|
