Accepting request 1161223 from home:michael-chang:branches:Base:System
- Correct the erroneous sequence in determining GRUB_FS and GRUB_DEVICE (bsc#1221904) * grub2-pass-corret-root-for-nfsroot.patch OBS-URL: https://build.opensuse.org/request/show/1161223 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=496
This commit is contained in:
parent
11e8d5171e
commit
a7ee4782f3
@ -13,6 +13,7 @@ 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.
|
on the script level and not use grub2-probe for above reasons.
|
||||||
|
|
||||||
v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
|
v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
|
||||||
|
v3: Fix the wrong order of GRUB_FS/GRUB_DEVICE (bsc#1221904)
|
||||||
|
|
||||||
---
|
---
|
||||||
util/grub-mkconfig.in | 37 ++++++++++++++++++++++++++++++-------
|
util/grub-mkconfig.in | 37 ++++++++++++++++++++++++++++++-------
|
||||||
@ -20,7 +21,7 @@ v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
|
|||||||
|
|
||||||
--- a/util/grub-mkconfig.in
|
--- a/util/grub-mkconfig.in
|
||||||
+++ b/util/grub-mkconfig.in
|
+++ b/util/grub-mkconfig.in
|
||||||
@@ -131,26 +131,54 @@
|
@@ -131,26 +131,55 @@
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -65,16 +66,17 @@ v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
|
|||||||
+ GRUB_DEVICE_PARTUUID=""
|
+ GRUB_DEVICE_PARTUUID=""
|
||||||
+ GRUB_FS="unknown"
|
+ GRUB_FS="unknown"
|
||||||
+else
|
+else
|
||||||
|
+ # Device containing our userland. Typically used for root= parameter.
|
||||||
|
+ GRUB_DEVICE="`${grub_probe} --target=device /`"
|
||||||
+ # Filesystem for the device containing our userland. Used for stuff like
|
+ # Filesystem for the device containing our userland. Used for stuff like
|
||||||
+ # choosing Hurd filesystem module.
|
+ # choosing Hurd filesystem module.
|
||||||
+ GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
|
+ GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
|
||||||
+ # Device containing our userland. Typically used for root= parameter.
|
|
||||||
+ GRUB_DEVICE="`${grub_probe} --target=device /`"
|
|
||||||
+ GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
|
+ GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
|
||||||
+ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
|
+ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2> /dev/null`" || true
|
||||||
+fi
|
+fi
|
||||||
|
|
||||||
-if [ x"$GRUB_FS" = xunknown ]; then
|
-if [ x"$GRUB_FS" = xunknown ]; then
|
||||||
|
+# Strive to circumvent grub to enable unsupported filesystem, for eg, nfsroot
|
||||||
+if [ x"$GRUB_FS" = x ] || [ x"$GRUB_FS" = xunknown ]; then
|
+if [ x"$GRUB_FS" = x ] || [ x"$GRUB_FS" = xunknown ]; then
|
||||||
GRUB_FS="$(stat -f -c %T / || echo unknown)"
|
GRUB_FS="$(stat -f -c %T / || echo unknown)"
|
||||||
fi
|
fi
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 25 02:20:38 UTC 2024 - Michael Chang <mchang@suse.com>
|
||||||
|
|
||||||
|
- Correct the erroneous sequence in determining GRUB_FS and GRUB_DEVICE
|
||||||
|
(bsc#1221904)
|
||||||
|
* grub2-pass-corret-root-for-nfsroot.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 22 06:01:13 UTC 2024 - Michael Chang <mchang@suse.com>
|
Fri Mar 22 06:01:13 UTC 2024 - Michael Chang <mchang@suse.com>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user