fix lxc-ps usage with -C arg for lxc 0.7.5
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 13 Dec 2011 12:54:24 +0000 (12:54 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 13 Dec 2011 12:54:24 +0000 (12:54 +0000)
Reported by Gordon Henderson <gordon(at)drogon.net>

git-svn-id: svn://svn.rot13.org/sysadmin-cookbook@284 191e9f34-6774-4a6d-acfc-7664dacd4a2a

recepies/lxc/lxc-watchdog.sh

index 59c8ac9..5521f47 100755 (executable)
@@ -106,7 +106,11 @@ lxc_kill() {
        name=$1
        sig=$2
 
-       init_pid=`lxc-ps -C init -o pid | grep "^$name" | cut -d" " -f2-`
+       ver=`lxc-version | cut -d: -f2 | sed 's/\.//g'`
+       opts=''
+       test $ver -ge 075 && opts='--'
+
+       init_pid=`lxc-ps $opts -C init -o pid | grep "^$name" | cut -d" " -f2-`
        if [ -z "$init_pid" ] ; then
                lxc-info -n $name
                exit 1