mirror of
https://github.com/zfsonlinux/zfs-auto-snapshot.git
synced 2025-08-18 16:38:50 +02:00
9684 6762453 broke auto-include and disabling of snapshots of swapvols
This commit is contained in:
@@ -959,7 +959,7 @@ function auto_include {
|
|||||||
for pool in ${FIRSTRUN_POOLS} ; do
|
for pool in ${FIRSTRUN_POOLS} ; do
|
||||||
# This is the first time the service has run on this pool,
|
# This is the first time the service has run on this pool,
|
||||||
# set appropriate zfs user properties on it
|
# set appropriate zfs user properties on it
|
||||||
$PFZFS set com.sun:auto-snapshot=true $pool
|
pfexec_zfs set com.sun:auto-snapshot=true $pool
|
||||||
done
|
done
|
||||||
|
|
||||||
# check for swap devices using zvols.
|
# check for swap devices using zvols.
|
||||||
@@ -967,7 +967,7 @@ function auto_include {
|
|||||||
SWAP=$(swap -l | grep "/dev/zvol/dsk/" | awk '{print $1}')
|
SWAP=$(swap -l | grep "/dev/zvol/dsk/" | awk '{print $1}')
|
||||||
SWAPVOLS=""
|
SWAPVOLS=""
|
||||||
for swap in $SWAP ; do
|
for swap in $SWAP ; do
|
||||||
SWAPVOLS="$SWAPVOLS $(echo $swap | sed -e 's#/dev/zvol/dsk/##')"
|
SWAPVOLS="$SWAPVOLS $(echo $swap | sed -e 's#/dev/zvol/dsk/##')"
|
||||||
done
|
done
|
||||||
|
|
||||||
# can't run dumpadm as a non-root user, so check for dumpadm.conf
|
# can't run dumpadm as a non-root user, so check for dumpadm.conf
|
||||||
|
Reference in New Issue
Block a user