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

Allow specifying UTC vs local timezone as program argument #77

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow specifying UTC vs local timezone as program argument #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45fb90f
Allow specifying UTC vs local timezone as program argument
jbnance Dec 22, 2017
8fc6454
Fix longoption copypasta and move option to next line
jbnance Dec 27, 2017
3ded4da
Set default for opt_local_tz
jbnance Feb 13, 2018
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
3 changes: 3 additions & 0 deletions src/zfs-auto-snapshot.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ LAB is usually 'hourly', 'daily', or 'monthly'.
\fB\-p\fR, \fB\-\-prefix\fR=\fIPRE\fR
PRE is 'zfs\-auto\-snap' by default.
.TP
\fB\-\-local\-tz\fR
Use system's local timezone instead of UTC in snapshot names.
.TP
\fB\-q\fR, \fB\-\-quiet\fR
Suppress warnings and notices at the console.
.TP
Expand Down
18 changes: 16 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 @@ -42,6 +42,7 @@ opt_verbose=''
opt_pre_snapshot=''
opt_post_snapshot=''
opt_do_snapshots=1
opt_local_tz=''

# Global summary statistics.
DESTRUCTION_COUNT='0'
Expand All @@ -65,6 +66,8 @@ 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.
--local-tz Use system's local timezone instead of UTC 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 @@ -210,7 +213,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=debug,help,quiet,syslog,verbose \
--longoptions=local-tz,debug,help,quiet,syslog,verbose \
--longoptions=pre-snapshot:,post-snapshot:,destroy-only \
--options=dnshe:l:k:p:rs:qgv \
-- "$@" ) \
Expand Down Expand Up @@ -286,6 +289,10 @@ do
opt_prefix="$2"
shift 2
;;
(--local-tz)
opt_local_tz='1'
shift 1
;;
(-q|--quiet)
opt_debug=''
opt_quiet='1'
Expand Down Expand Up @@ -534,7 +541,14 @@ 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)
# If the --local-tz flag is set use the system's timezone.
# Otherwise, the default is to use UTC.
if [ -n "$opt_local_tz" ]
then
DATE=$(date +%F-%H%M)
else
DATE=$(date --utc +%F-%H%M)
fi

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