Page MenuHomeFreeBSD
Files F133053871

D26185.id76221.diff
No OneTemporary
Actions

D26185.id76221.diff
View Options

Index: libexec/rc/rc.d/mountcritlocal
===================================================================
--- libexec/rc/rc.d/mountcritlocal
+++ libexec/rc/rc.d/mountcritlocal
@@ -4,7 +4,7 @@
#
# PROVIDE: mountcritlocal
-# REQUIRE: root hostid_save mdconfig
+# REQUIRE: root hostid_save mdconfig zvol
# KEYWORD: nojail shutdown
. /etc/rc.subr
Index: libexec/rc/rc.d/zfs
===================================================================
--- libexec/rc/rc.d/zfs
+++ libexec/rc/rc.d/zfs
@@ -25,13 +25,6 @@
zfs_start_main()
{
- local cachefile
-
- for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
- if [ -r $cachefile ]; then
- zpool import -c $cachefile -a
- fi
- done
zfs mount -va
zfs share -a
if [ ! -r /etc/zfs/exports ]; then
Index: libexec/rc/rc.d/zpool
===================================================================
--- /dev/null
+++ libexec/rc/rc.d/zpool
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zpool
+# REQUIRE: hostid
+# BEFORE: zvol mountcritlocal
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="zpool"
+desc="Import ZPOOLs"
+rcvar="zfs_enable"
+start_cmd="zpool_start"
+required_modules="zfs"
+
+zpool_start()
+{
+ local cachefile
+
+ for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
+ if [ -r $cachefile ]; then
+ zpool import -c $cachefile -a -N
+ fi
+ done
+}
+
+load_rc_config $name
+run_rc_command "$1"
Index: libexec/rc/rc.d/zvol
===================================================================
--- libexec/rc/rc.d/zvol
+++ libexec/rc/rc.d/zvol
@@ -4,7 +4,7 @@
#
# PROVIDE: zvol
-# REQUIRE: hostid
+# REQUIRE: zpool
# BEFORE: dumpon
# KEYWORD: nojail

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 12:31 PM (5 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24091436
Default Alt Text
D26185.id76221.diff (1 KB)

Event Timeline