Replace Popen calls with util.run_command

[time-slider.git] / usr / share / time-slider / lib / time_slider / smf.py

diff --git a/usr/share/time-slider/lib/time_slider/smf.py b/usr/share/time-slider/lib/time_slider/smf.py
index b241592..5c64109 100644 (file)
--- a/usr/share/time-slider/lib/time_slider/smf.py
+++ b/usr/share/time-slider/lib/time_slider/smf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2
 #
 # CDDL HEADER START
 #
@@ -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,26 +119,26 @@ class SMFInstance(Exception):
         self.set_prop(propgroup, propname, "integer", str(value))
 
     def refresh_service(self):
-        cmd = [PFCMD, SVCADMCMD, "refresh", self.instanceName]
-        p = subprocess.Popen(cmd, close_fds=True)
+        cmd = [SVCADMCMD, "refresh", self.instanceName]
+        util.run_command(cmd)
 
     def disable_service (self):
         if self.svcstate == "disabled":
             return
-        cmd = [PFCMD, SVCADMCMD, "disable", self.instanceName]
-        p = subprocess.Popen(cmd, close_fds=True)
+        cmd = [SVCADMCMD, "disable", self.instanceName]
+        util.run_command(cmd)
         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]
-        p = subprocess.Popen(cmd, close_fds=True)
+        cmd = [SVCADMCMD, "enable", self.instanceName]
+        util.run_command(cmd)
         self.svcstate = self.get_service_state()
 
     def mark_maintenance (self):
         cmd = [SVCADMCMD, "mark", "maintenance", self.instanceName]
-        subprocess.Popen(cmd, close_fds=True)
+        util.run_command(cmd)
 
     def __str__(self):
         ret = "SMF Instance:\n" +\