Restoring the func to mythvantage.

Still need to rework the pacman module.

1 files changed, 18 insertions, 41 deletions

diff --git a/abs/mv-core/func/power.py b/abs/mv-core/func/power.py
index fd847e7..297f464 100644
--- a/abs/mv-core/func/power.py
+++ b/abs/mv-core/func/power.py
@@ -1,58 +1,35 @@
-#!/usr/bin/python
-
-##
-## Grabs status from SMART to see if your hard drives are ok
-## Returns in the format of (return code, [line1, line2, line3,...])
-##
-## Copyright 2007, Red Hat, Inc
-## Michael DeHaan <mdehaan@redhat.com>
-##
-## This software may be freely redistributed under the terms of the GNU
-## general public license.
 ##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-##
-
 # other modules
 import sub_process
 
 # our modules
-from modules import func_module
+import func_module
 
 # =================================
 
 class power(func_module.FuncModule):
-    def __init__(self):
-        self.methods = {
-            "poweroff"    : self.poweroff,
-            "reboot"    : self.reboot,
-        }
-        func_module.FuncModule.__init__(self)
 
-    def poweroff(self,flags=""):
-        """
-        Returns a struct of hardware information.  By default, this pulls down
-        all of the devices.  If you don't care about them, set with_devices to
-        False.
-        """
+    version = "0.0.1"
+    api_version = "0.0.1"
+    description = "Reboot the server"
 
+    def reboot(self,flags="-q onecheck"):
+        """
+        Reboot the server
+	"""
         flags.replace(";","") # prevent stupidity
-
-        #cmd = sub_process.Popen("/sbin/poweroff %s" % flags,stdout=sub_process.PIPE,shell=True)
-        cmd = sub_process.Popen("/sbin/poweroff")
+	cmd = sub_process.Popen("/sbin/reboot")
         data = cmd.communicate()[0]
-
-        results = ['poweroff']
+        results = ['reboot']
         return (cmd.returncode, results)
 
-    def reboot(self,flags=""):
-    	cmd=sub_process.Popen('/sbin/reboot')
-	data = cmd.communicate()[0]
-	results = ['rebooting']
-
+    def poweroff (self,flags="-q onecheck"):
+        """
+        Reboot the server
+	"""
+        flags.replace(";","") # prevent stupidity
+	cmd = sub_process.Popen("/sbin/poweroff")
+        data = cmd.communicate()[0]
+        results = ['off']
         return (cmd.returncode, results)
 
-methods = power()
-register_rpc = methods.register_rpc