vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub.d/30_os-prober.in: Support btrrfs linux-prober extensions.

Browse source
This commit is contained in:
Fedora Ninjas 2013-04-05 14:55:37 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent eeada7b1da
commit 1f44478c26
2 changed files with 14 additions and 1 deletions

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-05 Fedora Ninjas <grub2-owner@fedoraproject.org>
* util/grub.d/30_os-prober.in: Support btrrfs linux-prober extensions.
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
Use GRUB_PROPERLY_ALIGNED_ARRAY in grub-core/disk/cryptodisk.c and Use GRUB_PROPERLY_ALIGNED_ARRAY in grub-core/disk/cryptodisk.c and

11
util/grub.d/30_os-prober.in
View file

@ -112,6 +112,11 @@ for OS in ${OSPROBED} ; do
LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`" LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`"
LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`" LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`"
BOOT="`echo ${OS} | cut -d ':' -f 4`" BOOT="`echo ${OS} | cut -d ':' -f 4`"
BTRFS="`echo ${OS} | cut -d ':' -f 5`"
if [ "x$BTRFS" = "xbtrfs" ]; then
BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`"
BTRFSsubvol="`echo ${OS} | cut -d ':' -f 7`"
fi
if [ -z "${LONGNAME}" ] ; then if [ -z "${LONGNAME}" ] ; then
LONGNAME="${LABEL}" LONGNAME="${LABEL}"
@ -145,7 +150,11 @@ EOF
EOF EOF
;; ;;
linux) linux)
LINUXPROBED="`linux-boot-prober ${DEVICE} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`" if [ "x$BTRFS" = "xbtrfs" ]; then
LINUXPROBED="`linux-boot-prober btrfs ${BTRFSuuid} ${BTRFSsubvol} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
else
LINUXPROBED="`linux-boot-prober ${DEVICE} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
fi
prepare_boot_cache= prepare_boot_cache=
boot_device_id= boot_device_id=
is_first_entry=true is_first_entry=true