From 16b19b0f2aee2b582a5b71e7312407a14529fdac Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 12 Jul 2011 02:13:25 +0200
Subject: ...

---
 src/os-plugins/plugins/qemukvm/XX_qemukvm.sh | 3 +--
 src/os-plugins/plugins/qemukvm/files/ifdown  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/os-plugins')

diff --git a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
index 7ee0d690..a239d034 100644
--- a/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
+++ b/src/os-plugins/plugins/qemukvm/XX_qemukvm.sh
@@ -97,7 +97,6 @@ ${qemukvm_imagesrc}." nonfatal
 
     cat >> /mnt/etc/sudoers << EOF
 # allow to start and stop kvm services / load-/unload kvm modules
-#ALL ALL=NOPASSWD: /etc/init.d/qemukvm
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/sbin/tunctl -t tap*
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/sbin/tunctl -d tap*
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/sbin/brctl addif br0 tap*
@@ -106,7 +105,7 @@ ALL ALL=NOPASSWD: /opt/openslx/rootfs/bin/ip addr add * dev tap*
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/sbin/udhcpd -S /tmp/qemukvm/*/udhcpd.conf
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/bin/cp /tmp/qemukvm/*/forwarding /proc/sys/net/ipv4/conf/tap*/forwarding
 ALL ALL=NOPASSWD: /opt/openslx/rootfs/bin/cp /tmp/qemukvm/*/forwarding /proc/sys/net/ipv4/conf/br*/forwarding
-ALL ALL=NOPASSWD: /opt/openslx/rootfs/bin/kill -9 $(cat /tmp/qemukvm/*/udhcpd.pid)
+ALL ALL=NOPASSWD: /opt/openslx/rootfs/usr/bin/killall -9 udhcpd
 EOF
   fi
 else
diff --git a/src/os-plugins/plugins/qemukvm/files/ifdown b/src/os-plugins/plugins/qemukvm/files/ifdown
index a79c0edc..4094f3a2 100644
--- a/src/os-plugins/plugins/qemukvm/files/ifdown
+++ b/src/os-plugins/plugins/qemukvm/files/ifdown
@@ -16,7 +16,8 @@
 # get VM_ID through tap name
 VM_ID=$(echo $1 | grep -oE "0[0-4]$")
 QKTMPDIR=/tmp/qemukvm/${USER}/${VM_ID}
-sudo /opt/openslx/rootfs/bin/kill -9 $(cat ${QKTMPDIR}/udhcpd.pid) || exit 0
+# not optimal if multiple machines run
+sudo /opt/openslx/rootfs/usr/bin/killall -9 udhcpd || exit 0
 sudo /opt/openslx/rootfs/bin/ip link set dev $1 down || exit 0
 
 # Produce a clean exit status
-- 
cgit v1.2.3-55-g7522