1 |
commit: 3ff0e784021281b01e7a005e81fef4506d0192cb |
2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 21 01:22:36 2015 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 21 13:13:30 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3ff0e784 |
7 |
|
8 |
Reimplement dozfs=force support |
9 |
|
10 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
11 |
|
12 |
defaults/initrd.scripts | 8 ++++++++ |
13 |
1 file changed, 8 insertions(+) |
14 |
|
15 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
16 |
index d1c3873..b7c8cc3 100644 |
17 |
--- a/defaults/initrd.scripts |
18 |
+++ b/defaults/initrd.scripts |
19 |
@@ -1042,6 +1042,14 @@ startVolumes() { |
20 |
elif [ -f /etc/zfs/zpool.cache ] |
21 |
then |
22 |
: |
23 |
+ # Depreciated support for dozfs=force |
24 |
+ elif [ -n "${ZPOOL_FORCE}" ] |
25 |
+ then |
26 |
+ /sbin/zpool import -f -N "${ZFS_POOL}" 2>&1 >/dev/null |
27 |
+ if [ $? -ne 0 ] |
28 |
+ then |
29 |
+ bad_msg "Failed to force import ${ZFS_POOL}" |
30 |
+ fi |
31 |
elif /sbin/zpool import -f -N -o readonly=on "${ZFS_POOL}" 2>&1 >/dev/null |
32 |
then |
33 |
mkdir -p /tmp/zfs |