-
Notifications
You must be signed in to change notification settings - Fork 251
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.
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
jbnance
wants to merge
3
commits into
zfsonlinux:master
Choose a base branch
from
jbnance:utc-options
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,6 +65,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. | ||
|
@@ -209,7 +211,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:,local-tz:,sep: \ | ||
--longoptions=debug,help,quiet,syslog,verbose \ | ||
--longoptions=pre-snapshot:,post-snapshot:,destroy-only \ | ||
--options=dnshe:l:k:p:rs:qgv \ | ||
|
@@ -286,6 +288,10 @@ do | |
opt_prefix="$2" | ||
shift 2 | ||
;; | ||
(--local-tz) | ||
opt_local_tz='1' | ||
shift 1 | ||
;; | ||
(-q|--quiet) | ||
opt_debug='' | ||
opt_quiet='1' | ||
|
@@ -534,7 +540,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" ] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
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" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
:
afterlocal-tz
needs to be removed because this option doesn't take an argument. I'd also suggest moving it down in to the next line.