Remove pfexec from system calls

diff --git a/usr/share/time-slider/lib/plugin/rsync/backup.py b/usr/share/time-slider/lib/plugin/rsync/backup.py
index d261600..2d1779f 100644 (file)
--- a/usr/share/time-slider/lib/plugin/rsync/backup.py
+++ b/usr/share/time-slider/lib/plugin/rsync/backup.py
@@ -532,7 +532,7 @@ class BackupQueue():
                     pending = [name for time,name in \
                                list_pending_snapshots(self._propName) if \
                                name.find(snapshot.fsname + '@') == 0]
-                    cmd = [zfs.PFCMD, zfs.ZFSCMD, "inherit", self._propName]
+                    cmd = [zfs.ZFSCMD, "inherit", self._propName]
                     util.debug("Unqueuing pending backups of deselected " \
                                "filesystem: " + snapshot.fsname + '\n' + \
                                str(pending),

diff --git a/usr/share/time-slider/lib/plugin/zfssend/zfssend.py b/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
index 403cf5c..0490615 100644 (file)
--- a/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
+++ b/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
@@ -177,12 +177,6 @@ def main(argv):
                 sys.exit(-1)
         
         
-        # Invoke the send and receive commands via pfexec(1) since
-        # we are not using the role's shell to take care of that
-        # for us.
-        sendcmd.insert(0, smf.PFCMD)
-        recvcmd.insert(0, smf.PFCMD)
-
         try:
             sendP = subprocess.Popen(sendcmd,
                                      stdout=subprocess.PIPE,

diff --git a/usr/share/time-slider/lib/time_slider/smf.py b/usr/share/time-slider/lib/time_slider/smf.py
index 7d78cec..bdefada 100644 (file)
--- a/usr/share/time-slider/lib/time_slider/smf.py
+++ b/usr/share/time-slider/lib/time_slider/smf.py
@@ -95,14 +95,14 @@ class SMFInstance(Exception):
         return result
 
     def set_prop(self, propgroup, propname, proptype, value):
-        cmd = [PFCMD, SVCCFGCMD, "-s", self.instanceName, "setprop", \
+        cmd = [SVCCFGCMD, "-s", self.instanceName, "setprop", \
                propgroup + '/' + propname, "=", proptype + ":", \
                value]
         util.run_command(cmd)
         self.refresh_service()
 
     def set_string_prop(self, propgroup, propname, value):
-        cmd = [PFCMD, SVCCFGCMD, "-s", self.instanceName, "setprop", \
+        cmd = [SVCCFGCMD, "-s", self.instanceName, "setprop", \
                propgroup + '/' + propname, "=", "astring:",
                "\"%s\"" % (value)]
         util.run_command(cmd)
@@ -119,20 +119,20 @@ class SMFInstance(Exception):
         self.set_prop(propgroup, propname, "integer", str(value))
 
     def refresh_service(self):
-        cmd = [PFCMD, SVCADMCMD, "refresh", self.instanceName]
+        cmd = [SVCADMCMD, "refresh", self.instanceName]
         p = subprocess.Popen(cmd, close_fds=True)
 
     def disable_service (self):
         if self.svcstate == "disabled":
             return
-        cmd = [PFCMD, SVCADMCMD, "disable", self.instanceName]
+        cmd = [SVCADMCMD, "disable", self.instanceName]
         p = subprocess.Popen(cmd, close_fds=True)
         self.svcstate = self.get_service_state()
 
     def enable_service (self):
         if (self.svcstate == "online" or self.svcstate == "degraded"):
             return
-        cmd = [PFCMD, SVCADMCMD, "enable", self.instanceName]
+        cmd = [SVCADMCMD, "enable", self.instanceName]
         p = subprocess.Popen(cmd, close_fds=True)
         self.svcstate = self.get_service_state()
 

diff --git a/usr/share/time-slider/lib/time_slider/snapnowui.py b/usr/share/time-slider/lib/time_slider/snapnowui.py
old mode 100755 (executable)
new mode 100644 (file)
index d095181..688a196
--- a/usr/share/time-slider/lib/time_slider/snapnowui.py
+++ b/usr/share/time-slider/lib/time_slider/snapnowui.py
@@ -132,7 +132,7 @@ class SnapshotNowDialog:
       name = self.snap_name_entry.get_text()
       valid_name = self.validate_name (name, True)
       if name == valid_name:
-       cmd = "pfexec /usr/sbin/zfs snapshot %s@%s" % (self.zfs_fs, self.validate_name (self.snap_name_entry.get_text()))
+       cmd = "/usr/sbin/zfs snapshot %s@%s" % (self.zfs_fs, self.validate_name (self.snap_name_entry.get_text()))
        fin,fout,ferr = os.popen3(cmd)
         # Check for any error output generated and
         # return it to caller if so.

diff --git a/usr/share/time-slider/lib/time_slider/zfs.py b/usr/share/time-slider/lib/time_slider/zfs.py
old mode 100755 (executable)
new mode 100644 (file)
index b12e551..4db0574
--- a/usr/share/time-slider/lib/time_slider/zfs.py
+++ b/usr/share/time-slider/lib/time_slider/zfs.py
@@ -659,11 +659,11 @@ class ReadableDataset:
         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):
-        cmd = [PFCMD, ZFSCMD, "inherit", prop, self.name]
+        cmd = [ZFSCMD, "inherit", prop, self.name]
         outdata,errdata = util.run_command(cmd)
 
 class Snapshot(ReadableDataset):
@@ -740,9 +740,9 @@ class Snapshot(ReadableDataset):
         if self.exists() == False:
             return
         if deferred == False:
-            cmd = [PFCMD, ZFSCMD, "destroy", self.name]
+            cmd = [ZFSCMD, "destroy", self.name]
         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
@@ -758,7 +758,7 @@ class Snapshot(ReadableDataset):
         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):
@@ -788,7 +788,7 @@ class Snapshot(ReadableDataset):
         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
@@ -855,7 +855,7 @@ class ReadWritableDataset(ReadableDataset):
             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))

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 30ee0fb..1d4bc36 100755 (executable)
--- a/usr/share/time-slider/lib/time_slider/zfs.py.safe
+++ b/usr/share/time-slider/lib/time_slider/zfs.py.safe
@@ -661,11 +661,11 @@ class ReadableDataset:
         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):
-        cmd = [PFCMD, ZFSCMD, "inherit", prop, self.name]
+        cmd = [ZFSCMD, "inherit", prop, self.name]
         outdata,errdata = util.run_command(cmd)
 
 class Snapshot(ReadableDataset):
@@ -744,9 +744,9 @@ class Snapshot(ReadableDataset):
         if self.exists() == False:
             return
         if deferred == False:
-            cmd = [PFCMD, ZFSCMD, "destroy", self.name]
+            cmd = [ZFSCMD, "destroy", self.name]
         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
@@ -762,7 +762,7 @@ class Snapshot(ReadableDataset):
         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):
@@ -792,7 +792,7 @@ class Snapshot(ReadableDataset):
         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
@@ -859,7 +859,7 @@ class ReadWritableDataset(ReadableDataset):
             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))