1 diff -ur grub-2.04.orig/util/grub.d/10_linux.in grub-2.04/util/grub.d/10_linux.in
2 --- grub-2.04.orig/util/grub.d/10_linux.in 2019-08-18 15:58:15.105000000 +0200
3 +++ grub-2.04/util/grub.d/10_linux.in 2019-08-18 15:58:28.665000000 +0200
6 CLASS="--class gnu-linux --class gnu --class os"
8 +if [ "x${GRUB_RESTRICTED}" = "xtrue" ] ; then
9 + GRUB_UNRESTRICTED_OPTION=""
11 + GRUB_UNRESTRICTED_OPTION="--unrestricted"
14 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
15 OS="$(. /etc/os-release ; echo "$NAME $VERSION")"
18 title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
19 grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
21 - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
22 + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
24 - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
25 + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
27 if [ x$type != xrecovery ] ; then
28 save_default_entry | grub_add_tab
29 diff -ur grub-2.04.orig/util/grub.d/30_os-prober.in grub-2.04/util/grub.d/30_os-prober.in
30 --- grub-2.04.orig/util/grub.d/30_os-prober.in 2019-08-18 15:58:15.105000000 +0200
31 +++ grub-2.04/util/grub.d/30_os-prober.in 2019-08-18 15:58:28.665000000 +0200
36 +if [ "x${GRUB_RESTRICTED}" = "xtrue" ] ; then
37 + GRUB_UNRESTRICTED_OPTION=""
39 + GRUB_UNRESTRICTED_OPTION="--unrestricted"
42 if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then
43 # missing os-prober and/or linux-boot-prober
46 # TRANSLATORS: it refers on the OS residing on device %s
47 onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
49 -menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
50 +menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' {
52 save_default_entry | grub_add_tab
53 prepare_grub_to_access_device ${DEVICE} | grub_add_tab
56 onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
58 -menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
59 +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
61 save_default_entry | grub_add_tab
62 prepare_grub_to_access_device ${DEVICE} | grub_add_tab
65 onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
67 -menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
68 +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
70 save_default_entry | sed -e "s/^/\t/"
71 prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
74 if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
76 -menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
77 +menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
79 save_default_entry | grub_add_tab
80 printf '%s\n' "${prepare_boot_cache}"
83 title="${LLABEL} $onstr"
85 - menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' {
86 + menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' {
88 save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
89 printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
92 onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
94 -menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
95 +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os ${GRUB_UNRESTRICTED_OPTION} \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
97 save_default_entry | grub_add_tab
98 prepare_grub_to_access_device ${DEVICE} | grub_add_tab
99 diff -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in
100 --- grub-2.04.orig/util/grub-mkconfig.in 2019-08-18 15:58:15.106000000 +0200
101 +++ grub-2.04/util/grub-mkconfig.in 2019-08-18 15:58:28.666000000 +0200
103 GRUB_ENABLE_CRYPTODISK \
105 GRUB_OS_PROBER_SKIP_LIST \
106 - GRUB_DISABLE_SUBMENU
107 + GRUB_DISABLE_SUBMENU \
110 if test "x${grub_cfg}" != "x"; then
111 rm -f "${grub_cfg}.new"