git://git.camperquake.de
/
time-slider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update README.md to specify the python requirements
[time-slider.git]
/
usr
/
share
/
time-slider
/
lib
/
time_slider
/
zfs.py.safe
diff --git
a/usr/share/time-slider/lib/time_slider/zfs.py.safe
b/usr/share/time-slider/lib/time_slider/zfs.py.safe
index
77b1150
..
d2691d5
100755
(executable)
--- a/
usr/share/time-slider/lib/time_slider/zfs.py.safe
+++ b/
usr/share/time-slider/lib/time_slider/zfs.py.safe
@@
-1,4
+1,4
@@
-#!/usr/bin/python
2.6
+#!/usr/bin/python
3
#
# CDDL HEADER START
#
#
# CDDL HEADER START
#
@@
-661,11
+661,11
@@
class ReadableDataset:
return outdata.rstrip()
def set_user_property(self, prop, value):
return outdata.rstrip()
def set_user_property(self, prop, value):
- cmd = [
PFCMD,
ZFSCMD, "set", "%s=%s" % (prop, value), self.name]
+ cmd = [ZFSCMD, "set", "%s=%s" % (prop, value), self.name]
outdata,errdata = util.run_command(cmd)
def unset_user_property(self, prop):
outdata,errdata = util.run_command(cmd)
def unset_user_property(self, prop):
- cmd = [
PFCMD,
ZFSCMD, "inherit", prop, self.name]
+ cmd = [ZFSCMD, "inherit", prop, self.name]
outdata,errdata = util.run_command(cmd)
class Snapshot(ReadableDataset):
outdata,errdata = util.run_command(cmd)
class Snapshot(ReadableDataset):
@@
-744,9
+744,9
@@
class Snapshot(ReadableDataset):
if self.exists() == False:
return
if deferred == False:
if self.exists() == False:
return
if deferred == False:
- cmd = [
PFCMD,
ZFSCMD, "destroy", self.name]
+ cmd = [ZFSCMD, "destroy", self.name]
else:
else:
- cmd = [
PFCMD,
ZFSCMD, "destroy", "-d", self.name]
+ cmd = [ZFSCMD, "destroy", "-d", self.name]
outdata,errdata = util.run_command(cmd)
# Clear the global snapshot cache so that a rescan will be
outdata,errdata = util.run_command(cmd)
# Clear the global snapshot cache so that a rescan will be
@@
-762,7
+762,7
@@
class Snapshot(ReadableDataset):
if self.exists() == False:
return
if self.exists() == False:
return
- cmd = [
PFCMD,
ZFSCMD, "hold", tag, self.name]
+ cmd = [ZFSCMD, "hold", tag, self.name]
outdata,errdata = util.run_command(cmd)
def holds(self):
outdata,errdata = util.run_command(cmd)
def holds(self):
@@
-792,7
+792,7
@@
class Snapshot(ReadableDataset):
if self.exists() == False:
return
if self.exists() == False:
return
- cmd = [
PFCMD,
ZFSCMD, "release", tag, self.name]
+ cmd = [ZFSCMD, "release", tag, self.name]
outdata,errdata = util.run_command(cmd)
# Releasing the snapshot might cause it get automatically
outdata,errdata = util.run_command(cmd)
# Releasing the snapshot might cause it get automatically
@@
-859,7
+859,7
@@
class ReadWritableDataset(ReadableDataset):
Recursively snapshot childfren of this dataset.
Default = False
"""
Recursively snapshot childfren of this dataset.
Default = False
"""
- cmd = [
PFCMD,
ZFSCMD, "snapshot"]
+ cmd = [ZFSCMD, "snapshot"]
if recursive == True:
cmd.append("-r")
cmd.append("%s@%s" % (self.name, snaplabel))
if recursive == True:
cmd.append("-r")
cmd.append("%s@%s" % (self.name, snaplabel))