|
 |
a5bd9f6 |
From 40951063e5fd8c4ae34b942039d38bfe69ffecb3 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Thu, 3 Jan 2013 23:19:19 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 083/364] * util/grub.d/10_kfreebsd.in: Correct the
|
|
|
a5bd9f6 |
patch to zpool.cache as it's always in /boot/zfs. Reported by: Yuta
|
|
|
a5bd9f6 |
Satoh.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 6 ++++++
|
|
|
a5bd9f6 |
util/grub.d/10_kfreebsd.in | 4 ++--
|
|
|
a5bd9f6 |
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 936af2f..a28a1f7 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,9 @@
|
|
|
a5bd9f6 |
+2013-01-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * util/grub.d/10_kfreebsd.in: Correct the patch to zpool.cache as it's
|
|
|
a5bd9f6 |
+ always in /boot/zfs.
|
|
|
a5bd9f6 |
+ Reported by: Yuta Satoh.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-01-03 Yuta Satoh <nigoro>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* util/grub.d/10_kfreebsd.in: Fix improper references to grub-probe by
|
|
|
a5bd9f6 |
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
|
|
|
a5bd9f6 |
index 2a48b52..c123ceb 100644
|
|
|
a5bd9f6 |
--- a/util/grub.d/10_kfreebsd.in
|
|
|
a5bd9f6 |
+++ b/util/grub.d/10_kfreebsd.in
|
|
|
a5bd9f6 |
@@ -122,10 +122,10 @@ EOF
|
|
|
a5bd9f6 |
zfs)
|
|
|
a5bd9f6 |
load_kfreebsd_module opensolaris false
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
- ls "${dirname}/zfs/zpool.cache" > /dev/null
|
|
|
a5bd9f6 |
+ ls "/boot/zfs/zpool.cache" > /dev/null
|
|
|
a5bd9f6 |
printf '%s\n' "${prepare_boot_cache}"
|
|
|
a5bd9f6 |
sed "s/^/$submenu_indentation/" << EOF
|
|
|
a5bd9f6 |
- kfreebsd_module ${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
|
|
|
a5bd9f6 |
+ kfreebsd_module $(make_system_path_relative_to_its_root /boot)/zfs/zpool.cache type=/boot/zfs/zpool.cache
|
|
|
a5bd9f6 |
EOF
|
|
|
a5bd9f6 |
;;
|
|
|
a5bd9f6 |
esac
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|