diff options
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h | 2 | ||||
| -rw-r--r-- | sys/contrib/opensolaris/uts/common/sys/fs/zfs.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d502f39..2fac377 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -16,6 +16,8 @@ .. modules .. + zfs + .. .. dev mode=0555 .. diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h b/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h index 4416a5a..bcf8594 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h @@ -230,7 +230,7 @@ extern zpool_prop_t zpool_prop_iter(zpool_prop_f, void *, boolean_t); * The location of the pool configuration repository, shared between kernel and * userland. */ -#define ZPOOL_CACHE_DIR "/etc/zfs" +#define ZPOOL_CACHE_DIR "/boot/zfs" #define ZPOOL_CACHE_FILE "zpool.cache" #define ZPOOL_CACHE_TMP ".zpool.cache" diff --git a/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h b/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h index 4416a5a..bcf8594 100644 --- a/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h +++ b/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h @@ -230,7 +230,7 @@ extern zpool_prop_t zpool_prop_iter(zpool_prop_f, void *, boolean_t); * The location of the pool configuration repository, shared between kernel and * userland. */ -#define ZPOOL_CACHE_DIR "/etc/zfs" +#define ZPOOL_CACHE_DIR "/boot/zfs" #define ZPOOL_CACHE_FILE "zpool.cache" #define ZPOOL_CACHE_TMP ".zpool.cache" |
