Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2017-12-13 11:55:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Wed Dec 13 11:55:58 2017 rev:174 rq:555805 version:2.02
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2017-12-06
08:53:06.757013601 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-12-13
11:56:00.559511479 +0100
@@ -1,0 +2,7 @@
+Fri Dec 8 09:30:46 UTC 2017 - mch...@suse.com
+
+- Filter out autofs and securityfs from /proc/self/mountinfo to speed
+ up nfsroot test in large number of autofs mounts (bsc#1069094)
+ * modified grub2-pass-corret-root-for-nfsroot.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-pass-corret-root-for-nfsroot.patch ++++++
--- /var/tmp/diff_new_pack.WCfLCZ/_old 2017-12-13 11:56:02.695408371 +0100
+++ /var/tmp/diff_new_pack.WCfLCZ/_new 2017-12-13 11:56:02.695408371 +0100
@@ -3,7 +3,7 @@
Date: Thu, 30 Aug 2012 15:43:17 +0800
Subject: [PATCH] Pass corret root= for nfsroot
-References: bnc#774548
+References: bnc#774548, bsc#1069094
Patch-Mainline: no
Fix / is mounted on nfs. The fix is to pass kernel parameters
@@ -11,15 +11,18 @@
nfs file system module, the /boot on nfs is not possible and
grub2-probe not work in probing nfs mounted path. The fix is merely
on the script level and not use grub2-probe for above reasons.
+
+v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
+
---
util/grub-mkconfig.in | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
-Index: grub-2.02~beta2/util/grub-mkconfig.in
+Index: grub-2.02/util/grub-mkconfig.in
===================================================================
---- grub-2.02~beta2.orig/util/grub-mkconfig.in
-+++ grub-2.02~beta2/util/grub-mkconfig.in
-@@ -128,22 +128,47 @@ else
+--- grub-2.02.orig/util/grub-mkconfig.in
++++ grub-2.02/util/grub-mkconfig.in
+@@ -131,22 +131,47 @@ else
exit 1
fi
@@ -47,9 +50,9 @@
+ return
+ fi
+ done
-+} </proc/self/mountinfo
++}
+
-+NFSROOT_DEVICE="`probe_nfsroot_device`"
++NFSROOT_DEVICE="`awk '($9!="autofs")&&($9!="securityfs")'
/proc/self/mountinfo | probe_nfsroot_device`"
-# Filesystem for the device containing our userland. Used for stuff like
-# choosing Hurd filesystem module.
@@ -78,11 +81,11 @@
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub
fi
-Index: grub-2.02~beta2/util/grub.d/10_linux.in
+Index: grub-2.02/util/grub.d/10_linux.in
===================================================================
---- grub-2.02~beta2.orig/util/grub.d/10_linux.in
-+++ grub-2.02~beta2/util/grub.d/10_linux.in
-@@ -74,6 +74,12 @@ linux_entry ()
+--- grub-2.02.orig/util/grub.d/10_linux.in
++++ grub-2.02/util/grub.d/10_linux.in
+@@ -76,6 +76,12 @@ linux_entry ()
type="$3"
args="$4"
@@ -95,7 +98,7 @@
if [ -z "$boot_device_id" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
-@@ -129,7 +135,7 @@ linux_entry ()
+@@ -131,7 +137,7 @@ linux_entry ()
message="$(gettext_printf "Loading Linux %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
@@ -104,11 +107,11 @@
EOF
if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
-Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
+Index: grub-2.02/util/grub.d/20_linux_xen.in
===================================================================
---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
-+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
-@@ -89,6 +89,11 @@ linux_entry ()
+--- grub-2.02.orig/util/grub.d/20_linux_xen.in
++++ grub-2.02/util/grub.d/20_linux_xen.in
+@@ -91,6 +91,11 @@ linux_entry ()
type="$4"
args="$5"
xen_args="$6"
@@ -120,7 +123,7 @@
if [ -z "$boot_device_id" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
-@@ -128,7 +133,7 @@ linux_entry ()
+@@ -130,7 +135,7 @@ linux_entry ()
fi
multiboot ${rel_xen_dirname}/${xen_basename} placeholder
${xen_args} \${xen_rm_opts}
echo '$(echo "$lmessage" | grub_quote)'
