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

Merge GRUBFS and GRUB_FS variables.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-07 16:09:39 +01:00
parent 92e9352ded
commit 4c4ea9c7b5
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-07 Vladimir Serbinenko <phcoder@gmail.com>
Merge GRUBFS and GRUB_FS variables.
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com> 2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
Revert commit 69ca97c820, it caused failures when using OS device name Revert commit 69ca97c820, it caused failures when using OS device name

4
util/grub-mkconfig.in
View file

@ -139,6 +139,10 @@ GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_u
# 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`"
if [ x"$GRUB_FS" = xunknown ]; then
GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
fi
if test -f ${sysconfdir}/default/grub ; then if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub . ${sysconfdir}/default/grub
fi fi

8
util/grub.d/10_linux.in
View file

@ -51,13 +51,7 @@ else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
fi fi
GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" case x"$GRUB_FS" in
if [ x"$GRUBFS" = x ]; then
GRUBFS="$(stat -f --printf=%T / || true)"
fi
case x"$GRUBFS" in
xbtrfs) xbtrfs)
rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="`make_system_path_relative_to_its_root /`"
rootsubvol="${rootsubvol#/}" rootsubvol="${rootsubvol#/}"

8
util/grub.d/20_linux_xen.in
View file

@ -59,13 +59,7 @@ if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
fi fi
GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" case x"$GRUB_FS" in
if [ x"$GRUBFS" = x ]; then
GRUBFS="$(stat -f --printf=%T /)"
fi
case x"$GRUBFS" in
xbtrfs) xbtrfs)
rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="`make_system_path_relative_to_its_root /`"
rootsubvol="${rootsubvol#/}" rootsubvol="${rootsubvol#/}"