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

* util/grub.d/10_kfreebsd.in: Use ${grub_mkrelpath} not grub-mkrelpath.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-08 12:06:27 +01:00
parent 9f421dd1f0
commit 78e08dc3cb
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-11-08 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub.d/10_kfreebsd.in: Use ${grub_mkrelpath} not grub-mkrelpath.
2011-11-08 Vladimir Serbinenko <phcoder@gmail.com> 2011-11-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/zfs/zfs.c (zap_iterate): Remove set but not used * grub-core/fs/zfs/zfs.c (zap_iterate): Remove set but not used

2
util/grub.d/10_kfreebsd.in
View file

@ -160,7 +160,7 @@ while [ "x$list" != "x" ] ; do
# zpool name # zpool name
kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE}) kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE})
# filesystem name (empty string for the main filesystem) # filesystem name (empty string for the main filesystem)
kfreebsd_device="${kfreebsd_device}$(grub-mkrelpath / | sed -e "s,/*@$,,")" kfreebsd_device="${kfreebsd_device}$(${grub_mkrelpath} / | sed -e "s,/*@$,,")"
;; ;;
*) *)
kfreebsd_device=${kfreebsd_fs}id/${GRUB_DEVICE_UUID} kfreebsd_device=${kfreebsd_fs}id/${GRUB_DEVICE_UUID}