Merge GRUBFS and GRUB_FS variables.
This commit is contained in:
parent
92e9352ded
commit
4c4ea9c7b5
4 changed files with 10 additions and 14 deletions
|
@ -51,13 +51,7 @@ else
|
|||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
||||
fi
|
||||
|
||||
GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
|
||||
|
||||
if [ x"$GRUBFS" = x ]; then
|
||||
GRUBFS="$(stat -f --printf=%T / || true)"
|
||||
fi
|
||||
|
||||
case x"$GRUBFS" in
|
||||
case x"$GRUB_FS" in
|
||||
xbtrfs)
|
||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
||||
rootsubvol="${rootsubvol#/}"
|
||||
|
|
|
@ -59,13 +59,7 @@ if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
|
|||
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
|
||||
fi
|
||||
|
||||
GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
|
||||
|
||||
if [ x"$GRUBFS" = x ]; then
|
||||
GRUBFS="$(stat -f --printf=%T /)"
|
||||
fi
|
||||
|
||||
case x"$GRUBFS" in
|
||||
case x"$GRUB_FS" in
|
||||
xbtrfs)
|
||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
||||
rootsubvol="${rootsubvol#/}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue