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

* util/grub.d/10_linux.in: Fix ZFS root passing.

Browse source
This commit is contained in:
Richard Laager 2012-03-10 13:36:08 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent e8e0566b0c
commit 7eea167113
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-03-10 Richard Laager <rlaager@wiktel.com>
* util/grub.d/10_linux.in: Fix ZFS root passing.
2012-03-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/videoinfo.c: Add TRANSLATORS comments. * grub-core/commands/videoinfo.c: Add TRANSLATORS comments.

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

@ -61,9 +61,9 @@ case x"$GRUBFS" in
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
fi;; fi;;
xzfs) xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
LINUX_ROOT_DEVICE="ZFS=${RPOOL}${bootfs}" LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
GRUB_CMDLINE_LINUX="boot=zfs rpool=${RPOOL} bootfs=${RPOOL}${bootfs} ${cmdline} ${GRUB_CMDLINE_LINUX}";;
esac esac
title_correction_code= title_correction_code=