grub: remove os_probes_disabled warning

the os_prober is disabled by default because it opens an attack vector.
u

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/grub b/lfs/grub
index 7b020a436e276aa45e43b11ef1becb7adca44c7b..cc1581306fec171dfaecac54a6bcb0e3e9b10889 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -98,6 +98,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch
        cd $(DIR_APP) && autoreconf -vfi
 

diff --git a/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch b/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch
new file mode 100644 (file)
index 0000000..310bbcb
--- /dev/null
+++ b/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch
@@ -0,0 +1,11 @@
+diff -Naur grub-2.06/util/grub.d/30_os-prober.in grub-2.06.new/util/grub.d/30_os-prober.in
+--- grub-2.06/util/grub.d/30_os-prober.in      2021-04-12 16:39:21.000000000 +0200
++++ grub-2.06.new/util/grub.d/30_os-prober.in  2021-06-19 09:25:08.973408717 +0200
+@@ -27,7 +27,6 @@
+ . "$pkgdatadir/grub-mkconfig_lib"
+ 
+ if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+-  grub_warn "$(gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.")"
+   exit 0
+ fi
+