forked from extern/zfs-auto-snapshot
Fixes from Niall Power: Need to depend on multi-user milestone, typo in method script, inconsistent avoidscrub value in hourly manifest.
This commit is contained in:
parent
b62130a877
commit
61d63aa2e0
@ -447,7 +447,7 @@ function take_snapshot {
|
|||||||
single_STATE=$?
|
single_STATE=$?
|
||||||
|
|
||||||
print_note "Taking recursive snapshots of $RECURSIVE_LIST"
|
print_note "Taking recursive snapshots of $RECURSIVE_LIST"
|
||||||
export snapshot_childrent=false
|
export snapshot_children=true
|
||||||
export fs_name="$RECURSIVE_LIST"
|
export fs_name="$RECURSIVE_LIST"
|
||||||
take_snapshot $FMRI no_propcache_repopulate
|
take_snapshot $FMRI no_propcache_repopulate
|
||||||
recursive_STATE=$?
|
recursive_STATE=$?
|
||||||
|
@ -70,7 +70,7 @@ and keeps 24 of these snapshots into the past.
|
|||||||
<propval name="verbose" type="boolean" value="false"
|
<propval name="verbose" type="boolean" value="false"
|
||||||
override="true"/>
|
override="true"/>
|
||||||
|
|
||||||
<propval name="avoidscrub" type="boolean" value="true"
|
<propval name="avoidscrub" type="boolean" value="false"
|
||||||
override="false"/>
|
override="false"/>
|
||||||
|
|
||||||
</property_group>
|
</property_group>
|
||||||
|
@ -34,13 +34,14 @@
|
|||||||
type='service'
|
type='service'
|
||||||
version='0.11'>
|
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
|
<dependency
|
||||||
name='fs-local'
|
name='multi-user'
|
||||||
grouping='require_all'
|
grouping='require_all'
|
||||||
restart_on='none'
|
restart_on='none'
|
||||||
type='service'>
|
type='service'>
|
||||||
<service_fmri value='svc:/system/filesystem/local' />
|
<service_fmri value='svc:/milestone/multi-user' />
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- we also need cron -->
|
<!-- we also need cron -->
|
||||||
|
Loading…
Reference in New Issue
Block a user