Only autoimport pools in zpool.cache

openzfsonosx · Jul 11, 2014 · 8e0c3c6 · 8e0c3c6
1 parent 6d622b2
commit 8e0c3c6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/cmd/zfs_util/zfs_util.c b/cmd/zfs_util/zfs_util.c
@@ -64,14 +64,16 @@
 
 #define	ZPOOL_IMPORT_ALL_COOKIE	"/tmp/org.openzfsonosx.did-zpool-import-all"
 
-#ifndef DEBUG
+#ifdef DEBUG
 int zfs_util_debug = 1;
 #else
 int zfs_util_debug = 0;
 #endif
 
 #define	printf	zfs_util_log
 
+#define ZFS_AUTOIMPORT_ZPOOL_CACHE_ONLY
+
 const char *progname;
 libzfs_handle_t *g_zfs;
 

diff --git a/etc/launchd/launchd.d/Makefile.am b/etc/launchd/launchd.d/Makefile.am
@@ -1,23 +1,31 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 launchdscript_SCRIPTS = \
-	$(top_srcdir)/etc/launchd/launchd.d/zed.service.sh \
-	$(top_srcdir)/etc/launchd/launchd.d/zpool-autoimport.sh \
-	$(top_srcdir)/etc/launchd/launchd.d/zpool-import-all.sh
+	zed.service.sh \
+	zpool-autoimport.sh \
+	zpool-import-all.sh
+
+CLEANFILES = $(launchdscript_SCRIPTS)
 
 EXTRA_DIST = \
 	$(top_srcdir)/etc/launchd/launchd.d/zed.service.sh.in \
 	$(top_srcdir)/etc/launchd/launchd.d/zpool-autoimport.sh.in \
 	$(top_srcdir)/etc/launchd/launchd.d/zpool-import-all.sh.in
 
-$(launchdscript_SCRIPTS):
-	-$(SED) -e 's,@bindir\@,$(bindir),g' \
+do_subst = -$(SED) -e 's,@bindir\@,$(bindir),g' \
 		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
-		-e 's,@launchdscriptdir\@,$(launchdscriptdir),g' \
-		'[email protected]' >'$@'
-	chmod +x '$@'
+		-e 's,@launchdscriptdir\@,$(launchdscriptdir),g'
+
+zed.service.sh: zed.service.sh.in
+	$(do_subst) < $(top_srcdir)/etc/launchd/launchd.d/zed.service.sh.in > zed.service.sh
+	chmod +x zed.service.sh
+
+zpool-autoimport.sh: zpool-autoimport.sh.in
+	$(do_subst) < $(top_srcdir)/etc/launchd/launchd.d/zpool-autoimport.sh.in > zpool-autoimport.sh
+	chmod +x zpool-autoimport.sh
 
-distclean-local::
-	-$(RM) $(launchdscript_SCRIPTS)
+zpool-import-all.sh: zpool-import-all.sh.in
+	$(do_subst) < $(top_srcdir)/etc/launchd/launchd.d/zpool-import-all.sh.in > zpool-import-all.sh
+	chmod +x zpool-import-all.sh
diff --git a/etc/launchd/launchd.d/zpool-import-all.sh.in b/etc/launchd/launchd.d/zpool-import-all.sh.in
@@ -2,6 +2,7 @@
 
 export ZPOOL=@sbindir@/zpool
 export ZPOOL_IMPORT_ALL_COOKIE=/tmp/org.openzfsonosx.did-zpool-import-all
+export ZPOOL_CACHE=/etc/zfs/zpool.cache
 
-"${ZPOOL}" import -a
+"${ZPOOL}" import -c "${ZPOOL_CACHE}" -a
 touch "${ZPOOL_IMPORT_ALL_COOKIE}"