| 1 |
commit: 32585f117ffbf6d6a0aa317e6876ae7711a7f307 |
| 2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 21 15:18:54 2013 +0000 |
| 4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 27 04:28:28 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=32585f11 |
| 7 |
|
| 8 |
Add exit 1 to waitForZFS |
| 9 |
|
| 10 |
Proper use of call_func_timeout() requires that we return an exit status |
| 11 |
of 1 upon success. |
| 12 |
|
| 13 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
| 14 |
|
| 15 |
--- |
| 16 |
defaults/initrd.scripts | 1 + |
| 17 |
1 file changed, 1 insertion(+) |
| 18 |
|
| 19 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 20 |
index cb0fcb8..4b7c5ba 100644 |
| 21 |
--- a/defaults/initrd.scripts |
| 22 |
+++ b/defaults/initrd.scripts |
| 23 |
@@ -641,6 +641,7 @@ chooseKeymap() { |
| 24 |
# This also enables us to wait a reasonable amount of time until /dev/zfs appears. |
| 25 |
waitForZFS() { |
| 26 |
while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done; |
| 27 |
+ exit 1 |
| 28 |
} |
| 29 |
|
| 30 |
startVolumes() { |
Archives