From 9d768062e86e306c14979b3b19e5e96cbd357d20 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 26 Feb 2009 14:51:16 -0600 Subject: add * for host globbing on the func commands --- abs/mv-core/local-website/PKGBUILD | 2 +- abs/mv-core/local-website/contents/process.py | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/abs/mv-core/local-website/PKGBUILD b/abs/mv-core/local-website/PKGBUILD index 5fb61f6..e3f2ef4 100755 --- a/abs/mv-core/local-website/PKGBUILD +++ b/abs/mv-core/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=3 -pkgrel=75 +pkgrel=76 pkgdesc="Local website for MythVantage " arch=(i686 x86_64) #depends=('lighttpd') diff --git a/abs/mv-core/local-website/contents/process.py b/abs/mv-core/local-website/contents/process.py index d74fb47..6b45fd8 100755 --- a/abs/mv-core/local-website/contents/process.py +++ b/abs/mv-core/local-website/contents/process.py @@ -188,7 +188,7 @@ def go_shutdown(myhost): time.sleep(3) command="sudo /sbin/poweroff " else: - command="sudo /usr/bin/func " + myhost.strip() + " call power poweroff " + command="sudo /usr/bin/func \"" + myhost.strip() + "*\" call power poweroff " message="Shutdown from MBE:::ALT" os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) time.sleep(3) @@ -227,12 +227,7 @@ def go_reboot(myhost): time.sleep(3) command="sudo /sbin/reboot " else: - #sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@" - #sshcmd+=myhost.strip() - #cmd=" sudo poweroff" - #command=sshcmd + cmd + " 2>&1 " - #using func - command="sudo /usr/bin/func " + myhost.strip() + " call power reboot " + command="sudo /usr/bin/func \"" + myhost.strip() + "*\ call power reboot " message="Reboot from MBE:::ALT" os.system("/usr/bin/osdClient.pl " + myhost.strip() + " 5000 " + "\"" + message + "\"" ) time.sleep(3) -- cgit v0.12