- merged 2.12 from PLD

[packages/grub2.git] / restricted.patch

diff --git a/restricted.patch b/restricted.patch
index f5324df1b0a276ecc886adc85b14c6712185b3f7..9f5b20a90a9afd17ea100d88b155655debf7a8a9 100644 (file)
--- a/restricted.patch
+++ b/restricted.patch
@@ -1,6 +1,6 @@
-diff -ur grub-2.02.orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux.in
---- grub-2.02.orig/util/grub.d/10_linux.in     2018-09-04 10:42:04.656102314 +0000
-+++ grub-2.02/util/grub.d/10_linux.in  2018-09-04 11:00:55.728089580 +0000
+diff -ur grub-2.06.orig/util/grub.d/10_linux.in grub-2.06/util/grub.d/10_linux.in
+--- grub-2.06.orig/util/grub.d/10_linux.in     2022-08-30 02:18:01.042920967 +0200
++++ grub-2.06/util/grub.d/10_linux.in  2022-08-30 02:18:53.263002735 +0200
 @@ -28,6 +28,12 @@
  
  CLASS="--class gnu-linux --class gnu --class os"
@@ -14,7 +14,7 @@ diff -ur grub-2.02.orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux.i
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS="$(. /etc/os-release ; echo "$NAME $VERSION")"
  else
-@@ -92,9 +98,9 @@
+@@ -102,9 +108,9 @@
          title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
          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")"
        fi
@@ -26,10 +26,10 @@ diff -ur grub-2.02.orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux.i
    fi      
    if [ x$type != xrecovery ] ; then
        save_default_entry | grub_add_tab
-diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-prober.in
---- grub-2.02.orig/util/grub.d/30_os-prober.in 2018-09-04 10:42:04.649102314 +0000
-+++ grub-2.02/util/grub.d/30_os-prober.in      2018-09-04 11:01:57.024088889 +0000
-@@ -30,6 +30,12 @@
+diff -ur grub-2.06.orig/util/grub.d/30_os-prober.in grub-2.06/util/grub.d/30_os-prober.in
+--- grub-2.06.orig/util/grub.d/30_os-prober.in 2022-08-30 02:18:01.035920956 +0200
++++ grub-2.06/util/grub.d/30_os-prober.in      2022-08-30 02:20:26.805149188 +0200
+@@ -31,6 +31,12 @@
    exit 0
  fi
  
@@ -39,10 +39,10 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
 +  GRUB_UNRESTRICTED_OPTION="--unrestricted"
 +fi
 +
- if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then
+ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/null ; then
    # missing os-prober and/or linux-boot-prober
    exit 0
-@@ -52,7 +58,7 @@
+@@ -55,7 +61,7 @@
      # TRANSLATORS: it refers on the OS residing on device %s
      onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
          cat << EOF
@@ -51,7 +51,7 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
  EOF
        save_default_entry | grub_add_tab
        prepare_grub_to_access_device ${DEVICE} | grub_add_tab
-@@ -148,7 +154,7 @@
+@@ -151,7 +157,7 @@
  
          onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
@@ -60,7 +60,7 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
  EOF
        save_default_entry | grub_add_tab
        prepare_grub_to_access_device ${DEVICE} | grub_add_tab
-@@ -180,7 +186,7 @@
+@@ -183,7 +189,7 @@
        DEVICE=${DEVICE%@*}
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
@@ -69,16 +69,16 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
  EOF
        save_default_entry | sed -e "s/^/\t/"
        prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
-@@ -236,7 +242,7 @@
+@@ -247,7 +253,7 @@
  
-       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+       if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
              cat << EOF
 -menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
 +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' {
  EOF
            save_default_entry | grub_add_tab
            printf '%s\n' "${prepare_boot_cache}"
-@@ -256,7 +262,7 @@
+@@ -267,7 +273,7 @@
        fi
        title="${LLABEL} $onstr"
          cat << EOF
@@ -87,7 +87,7 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
  EOF
        save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
        printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
-@@ -293,7 +299,7 @@
+@@ -304,7 +310,7 @@
      hurd)
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
@@ -96,10 +96,10 @@ diff -ur grub-2.02.orig/util/grub.d/30_os-prober.in grub-2.02/util/grub.d/30_os-
  EOF
        save_default_entry | grub_add_tab
        prepare_grub_to_access_device ${DEVICE} | grub_add_tab
-diff -ur grub-2.02.orig/util/grub-mkconfig.in grub-2.02/util/grub-mkconfig.in
---- grub-2.02.orig/util/grub-mkconfig.in       2018-09-04 10:42:04.650102314 +0000
-+++ grub-2.02/util/grub-mkconfig.in    2018-09-04 10:50:40.159096510 +0000
-@@ -243,7 +243,8 @@
+diff -ur grub-2.06.orig/util/grub-mkconfig.in grub-2.06/util/grub-mkconfig.in
+--- grub-2.06.orig/util/grub-mkconfig.in       2022-08-30 02:18:01.036920957 +0200
++++ grub-2.06/util/grub-mkconfig.in    2022-08-30 02:18:53.264002736 +0200
+@@ -267,7 +267,8 @@
    GRUB_ENABLE_CRYPTODISK \
    GRUB_BADRAM \
    GRUB_OS_PROBER_SKIP_LIST \