From 61d63aa2e0b6f4eeaa1cfe15e48ff090118934fd Mon Sep 17 00:00:00 2001
From: Tim Foster <tim.foster@sun.com>
Date: Mon, 1 Sep 2008 10:11:36 +0100
Subject: [PATCH] Fixes from Niall Power: Need to depend on multi-user
 milestone, typo in method script, inconsistent avoidscrub value in hourly
 manifest.

---
 src/lib/svc/method/zfs-auto-snapshot                       | 2 +-
 .../manifest/system/filesystem/auto-snapshot-hourly.xml    | 2 +-
 .../svc/manifest/system/filesystem/zfs-auto-snapshot.xml   | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/svc/method/zfs-auto-snapshot b/src/lib/svc/method/zfs-auto-snapshot
index bf2023c..c5b6992 100755
--- a/src/lib/svc/method/zfs-auto-snapshot
+++ b/src/lib/svc/method/zfs-auto-snapshot
@@ -447,7 +447,7 @@ function take_snapshot {
 		single_STATE=$?
 
 		print_note "Taking recursive snapshots of $RECURSIVE_LIST"
-		export snapshot_childrent=false
+		export snapshot_children=true
 		export fs_name="$RECURSIVE_LIST"
 		take_snapshot $FMRI no_propcache_repopulate
 		recursive_STATE=$?
diff --git a/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml b/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
index 76f0e9f..fccef2a 100644
--- a/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
+++ b/src/var/svc/manifest/system/filesystem/auto-snapshot-hourly.xml
@@ -70,7 +70,7 @@ and keeps 24 of these snapshots into the past.
 	  <propval name="verbose" type="boolean" value="false"
 		   override="true"/>
 
-	  <propval name="avoidscrub" type="boolean" value="true"
+	  <propval name="avoidscrub" type="boolean" value="false"
 		   override="false"/>
 
 	</property_group>
diff --git a/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml b/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
index a81fdef..00de11d 100755
--- a/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
+++ b/src/var/svc/manifest/system/filesystem/zfs-auto-snapshot.xml
@@ -34,13 +34,14 @@
 	type='service'
 	version='0.11'>
 
-	<!-- no point in being able to take snapshots if we don't have a fs -->
+	<!-- we need to be multi-user to ensure the homedirs for the
+	zfssnap role is mounted -->
 	<dependency
-		name='fs-local'
+		name='multi-user'
 		grouping='require_all'
 		restart_on='none'
 		type='service'>
-		<service_fmri value='svc:/system/filesystem/local' />
+		<service_fmri value='svc:/milestone/multi-user' />
 	</dependency>
 	
 	<!-- we also need cron -->