Make the Usage statement consistent with the actual options supported.
Look for the daemons in /usr/sbin/ as only root can
execute them.
Change-Id: I111f8b4fddf347b946afd1eb69d0079561c0f0d0
diff --git a/.gitignore b/.gitignore
index 44dbcd6..6501940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.pyc
.idea/
+*.egg-info/
diff --git a/etc/lavapdu-listen.init b/etc/lavapdu-listen.init
index 5a0e06e..8545b1f 100644
--- a/etc/lavapdu-listen.init
+++ b/etc/lavapdu-listen.init
@@ -18,7 +18,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="lavapdu-listen" # short description
NAME=lavapdu-listen # short server's name (truncated for 15 chars)
-DAEMON=/usr/bin/lavapdu-listen # server's location
+DAEMON=/usr/sbin/lavapdu-listen # server's location
DAEMON_ARGS="$LOGLEVEL" # Arguments to run the daemon with
PIDFILE=/var/run/$DESC.pid
SCRIPTNAME=/etc/init.d/$NAME
diff --git a/etc/lavapdu-runner.init b/etc/lavapdu-runner.init
index a11b8f3..c9acb5b 100644
--- a/etc/lavapdu-runner.init
+++ b/etc/lavapdu-runner.init
@@ -18,7 +18,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="lavapdu-runner" # short description
NAME=lavapdu-runner # short server's name (truncated for 15 chars)
-DAEMON=/usr/bin/lavapdu-runner # server's location
+DAEMON=/usr/sbin/lavapdu-runner # server's location
DAEMON_ARGS="$LOGLEVEL" # Arguments to run the daemon with
PIDFILE=/var/run/$DESC.pid
SCRIPTNAME=/etc/init.d/$NAME
diff --git a/pduclient b/pduclient
index fdcdcb3..f9cb734 100755
--- a/pduclient
+++ b/pduclient
@@ -4,7 +4,7 @@
import optparse
if __name__ == '__main__':
- usage = "Usage: %prog [-d] deamonhostname [-h] pduhostname -[p] pduportnum [-c] pducommand"
+ usage = "Usage: %prog --daemon deamonhostname --hostname pduhostname --port pduportnum --command pducommand"
description = "LAVA PDU daemon client"
commands = ["reboot", "on", "off", "delayed"]
parser = optparse.OptionParser(usage=usage, description=description)
diff --git a/setup.py b/setup.py
index f74a3eb..577345f 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
setup(
name='lavapdu',
- version="0.0.2",
+ version="0.0.3",
author="Matthew Hart",
author_email="matthew.hart@linaro.org",
license="GPL2+",