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

* util/grub.d/10_linux.in: Fix syntax error resulting in

Browse source 
Richard Laager's patch.
	* util/grub.d/20_linux_xen.in: Propagate Richard Laager's patch.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-10 14:42:26 +01:00
parent 3fd8bae5cf
commit 6dd412cdcc
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-03-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub.d/10_linux.in: Fix syntax error resulting in
Richard Laager's patch.
* util/grub.d/20_linux_xen.in: Propagate Richard Laager's patch.
2012-03-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-10 Vladimir Serbinenko <phcoder@gmail.com>
* tests/partmap_test.in: Replace qemu-img usage with dd to decrease * tests/partmap_test.in: Replace qemu-img usage with dd to decrease

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

@ -64,6 +64,7 @@ case x"$GRUBFS" in
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` 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}"
;;
esac esac
title_correction_code= title_correction_code=

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

@ -69,9 +69,10 @@ 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=