Magellan Linux

Annotation of /trunk/grub/patches/grub-2.00-grub-mkconfig-fallback-to-blkid-instead-of-grub-probe-for-unknown-root-partition-types.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2832 - (hide annotations) (download)
Thu Oct 13 09:33:42 2016 UTC (7 years, 8 months ago) by niro
File size: 825 byte(s)
-added f2fs workaround
1 niro 2832 diff -Naur grub-2.00/util/grub-mkconfig.in grub-2.00-blkid/util/grub-mkconfig.in
2     --- grub-2.00/util/grub-mkconfig.in 2012-04-05 19:41:07.000000000 +0200
3     +++ grub-2.00-blkid/util/grub-mkconfig.in 2016-10-13 11:31:33.714174779 +0200
4     @@ -131,6 +131,14 @@
5     # Device containing our userland. Typically used for root= parameter.
6     GRUB_DEVICE="`${grub_probe} --target=device /`"
7     GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
8     +# workaround unknown partion types
9     +if [ x"${GRUB_DEVICE_UUID}" = x ]
10     +then
11     + if [ -x `type -P blkid` ]
12     + then
13     + GRUB_DEVICE_UUID="`blkid -s UUID -o value ${GRUB_DEVICE} 2> /dev/null`" || true
14     + fi
15     +fi
16    
17     # Device containing our /boot partition. Usually the same as GRUB_DEVICE.
18     GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"