Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option --utc to use UTC dates in snapshot names instead of the local time zone. #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −2
Open

Add option --utc to use UTC dates in snapshot names instead of the local time zone. #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dbeebc
Add option --utc to use UTC dates in snapshot names instead of the local
fungus Apr 29, 2014
bd68148
Snapshot name collision handling.
fungus Apr 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/zfs-auto-snapshot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ opt_sep='_'
opt_setauto=''
opt_syslog=''
opt_skip_scrub=''
opt_utc=''
opt_verbose=''

# Global summary statistics.
Expand All @@ -62,6 +63,7 @@ print_usage ()
-k, --keep=NUM Keep NUM recent snapshots and destroy older snapshots.
-l, --label=LAB LAB is usually 'hourly', 'daily', or 'monthly'.
-p, --prefix=PRE PRE is 'zfs-auto-snap' by default.
--utc Use UTC times in snapshot names.
-q, --quiet Suppress warnings and notices at the console.
--send-full=F Send zfs full backup. Unimplemented.
--send-incr=F Send zfs incremental backup. Unimplemented.
Expand Down Expand Up @@ -156,6 +158,10 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]

for ii in $TARGETS
do
if echo $SNAPSHOTS_OLD | grep -q "$ii@$NAME"
then
do_run "zfs destroy $FLAGS '$ii@$NAME'"
fi
if do_run "zfs snapshot $PROPS $FLAGS '$ii@$NAME'"
then
SNAPSHOT_COUNT=$(( $SNAPSHOT_COUNT + 1 ))
Expand Down Expand Up @@ -196,7 +202,7 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]

GETOPT=$(getopt \
--longoptions=default-exclude,dry-run,fast,skip-scrub,recursive \
--longoptions=event:,keep:,label:,prefix:,sep: \
--longoptions=event:,keep:,label:,prefix:,sep:,utc \
--longoptions=debug,help,quiet,syslog,verbose \
--options=dnshe:l:k:p:rs:qgv \
-- "$@" ) \
Expand Down Expand Up @@ -272,6 +278,10 @@ do
opt_prefix="$2"
shift 2
;;
(--utc)
opt_utc='--utc'
shift 1
;;
(-q|--quiet)
opt_debug=''
opt_quiet='1'
Expand Down Expand Up @@ -504,7 +514,7 @@ SNAPPROP="-o com.sun:auto-snapshot-desc='$opt_event'"

# ISO style date; fifteen characters: YYYY-MM-DD-HHMM
# On Solaris %H%M expands to 12h34.
DATE=$(date --utc +%F-%H%M)
DATE=$(date $opt_utc +%F-%H%M)

# The snapshot name after the @ symbol.
SNAPNAME="$opt_prefix${opt_label:+$opt_sep$opt_label}-$DATE"
Expand Down