summaryrefslogtreecommitdiffstats
path: root/src/os-plugins/plugins/qemukvm/files
diff options
context:
space:
mode:
Diffstat (limited to 'src/os-plugins/plugins/qemukvm/files')
-rw-r--r--src/os-plugins/plugins/qemukvm/files/ifup6
-rw-r--r--src/os-plugins/plugins/qemukvm/files/run-virt.include18
2 files changed, 12 insertions, 12 deletions
diff --git a/src/os-plugins/plugins/qemukvm/files/ifup b/src/os-plugins/plugins/qemukvm/files/ifup
index b3218798..e53ae3b6 100644
--- a/src/os-plugins/plugins/qemukvm/files/ifup
+++ b/src/os-plugins/plugins/qemukvm/files/ifup
@@ -22,7 +22,7 @@ VM_ID=$(echo $1 | grep -oE "0[0-4]$")
QKTMPDIR=/tmp/qemukvm/${USER}/${VM_ID}
# Use the udhcpcd as DHCP server and brctl as provided by default in OpenSLX
-# environments via uclibc-wrapper.
+# environments.
. ${PLUGINCONFDIR}/network.conf
# Just decide by the virtual network device used which kind of connection
@@ -50,7 +50,7 @@ case "$1" in
${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf \
>${QKTMPDIR}/udhcpd.conf
touch ${QKTMPDIR}/udhcpd.leases
- sudo /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \
+ sudo /opt/openslx/rootfs/usr/sbin/udhcpd \
-S ${QKTMPDIR}/udhcpd.conf
# iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
;;
@@ -67,7 +67,7 @@ case "$1" in
-e "s,LEASEFILE,${QKTMPDIR}/udhcpd.leases," \
${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf >${QKTMPDIR}/udhcpd.conf
touch ${QKTMPDIR}/udhcpd.leases
- sudo /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \
+ sudo /opt/openslx/rootfs/usr/sbin/udhcpd \
-S ${QKTMPDIR}/udhcpd.conf
;;
esac
diff --git a/src/os-plugins/plugins/qemukvm/files/run-virt.include b/src/os-plugins/plugins/qemukvm/files/run-virt.include
index 02c70469..c8b2a82b 100644
--- a/src/os-plugins/plugins/qemukvm/files/run-virt.include
+++ b/src/os-plugins/plugins/qemukvm/files/run-virt.include
@@ -122,24 +122,24 @@ qemu_ifscr="script=${PLUGINCONFQK}/ifup,downscript=${PLUGINCONFQK}/ifdown"
case "${network_kind}" in
bridge*)
VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapbridge${VM_ID},${qemu_ifscr}"
- sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapbridge${VM_ID} -u ${USER} \
+ sudo /opt/openslx/rootfs/sbin/tunctl -t tapbridge${VM_ID} -u ${USER} \
>/dev/null 2>&1
- sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID}
- POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d tapbridge${VM_ID}"
+ sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 tapbridge${VM_ID}
+ POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d tapbridge${VM_ID}"
;;
nat)
VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=tapnat${VM_ID},${qemu_ifscr}"
- sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t tapnat${VM_ID} -u ${USER} \
+ sudo /opt/openslx/rootfs/sbin/tunctl -t tapnat${VM_ID} -u ${USER} \
>/dev/null 2>&1
- sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID}
- POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d tapnat${VM_ID}"
+ sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 tapnat${VM_ID}
+ POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d tapnat${VM_ID}"
;;
host*)
VIRTCMDOPTS="${VIRTCMDOPTS} -net tap,ifname=taphost${VM_ID},${qemu_ifscr}"
- sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t taphost${VM_ID} -u ${USER} \
+ sudo /opt/openslx/rootfs/sbin/tunctl -t taphost${VM_ID} -u ${USER} \
>/dev/null 2>&1
- sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 taphost${VM_ID}
- POSTRUN="/opt/openslx/uclib-rootfs/sbin/tunctl -d taphost${VM_ID}"
+ sudo /opt/openslx/rootfs/usr/sbin/brctl addif br0 taphost${VM_ID}
+ POSTRUN="/opt/openslx/rootfs/sbin/tunctl -d taphost${VM_ID}"
;;
*)
network_kind="user"