|
|
@ -121,10 +121,12 @@ def get_snapshot_zfs_name(snapshot): |
|
|
|
|
|
|
|
|
|
|
|
# Generate ZFS identifier string from arguments |
|
|
|
# Generate ZFS identifier string from arguments |
|
|
|
def make_snapshot_zfs_name(dataset, tag_or_snapshot, serial=None): |
|
|
|
def make_snapshot_zfs_name(dataset, tag_or_snapshot, serial=None): |
|
|
|
|
|
|
|
global config |
|
|
|
|
|
|
|
|
|
|
|
if serial is None: |
|
|
|
if serial is None: |
|
|
|
return '{}@{}'.format(dataset, tag_or_snapshot) |
|
|
|
return '{}@{}'.format(dataset, tag_or_snapshot) |
|
|
|
else: |
|
|
|
else: |
|
|
|
return '{}@{}:{}'.format(dataset, tag_or_snapshot, serial) |
|
|
|
return '{}@{}{}{}'.format(dataset, tag_or_snapshot, config['separator'], serial) |
|
|
|
# |
|
|
|
# |
|
|
|
# Configuration functions |
|
|
|
# Configuration functions |
|
|
|
|
|
|
|
|
|
|
|