diff options
author | Michael Janczyk | 2010-04-06 22:28:32 +0200 |
---|---|---|
committer | Michael Janczyk | 2010-04-06 22:28:32 +0200 |
commit | 32f56a53722d65c785aa1770d191733f2fc9e1f2 (patch) | |
tree | 977cc5a3acfefa6fb1a61a2dc53f08f14d986570 /os-plugins/plugins/qemukvm/files/ifup | |
parent | cumulative commit of local branch, xen modifications and vmgrid plugin (diff) | |
download | core-32f56a53722d65c785aa1770d191733f2fc9e1f2.tar.gz core-32f56a53722d65c785aa1770d191733f2fc9e1f2.tar.xz core-32f56a53722d65c785aa1770d191733f2fc9e1f2.zip |
changed name of init-hook, qemukvm tun/tap config
Diffstat (limited to 'os-plugins/plugins/qemukvm/files/ifup')
-rw-r--r-- | os-plugins/plugins/qemukvm/files/ifup | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/os-plugins/plugins/qemukvm/files/ifup b/os-plugins/plugins/qemukvm/files/ifup index 43956b31..9d94ac64 100644 --- a/os-plugins/plugins/qemukvm/files/ifup +++ b/os-plugins/plugins/qemukvm/files/ifup @@ -40,11 +40,12 @@ case "$1" in # Configuring DHCP on host tap1 interface and enable IP masquerading #sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t $1 >/dev/null 2>&1 sudo ip addr add ${nataddress} dev $1 + sudo ip link set dev $1 up # not necessary since already done by run-virt.include #[ -d ${QKTMPDIR} ] || mkdir -p ${QKTMPDIR} # cut the last .NNN/MM from nataddress ${natnetwork%.*} # TODO: we use here atatic address, maybe change later - sed -e "s,NWIF,$1,;s,CNETWORK,192.168.1${VM_ID}.254," \ + sed -e "s,NWIF,$1,;s,CNETWORK,192.168.1${VM_ID}," \ -e "s,PIDFILE,${QKTMPDIR}/udhcpd.pid," \ -e "s,LEASEFILE,${QKTMPDIR}/udhcpd.leases," \ ${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf \ @@ -60,8 +61,11 @@ case "$1" in # Configuring DHCP on host tap2 interface #sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t $1 >/dev/null 2>&1 sudo ip addr add ${hoaddress} dev $1 + sudo ip link set dev $1 up #[ -d ${QKTMPDIR} ] || mkdir -p ${QKTMPDIR} - sed "s,NWIF,$1,;s,USER,${USER},;s,CNETWORK,192.168.1${VM_ID}.254," \ + sed -e "s,NWIF,$1,;s,USER,${USER},;s,CNETWORK,192.168.1${VM_ID}," \ + -e "s,PIDFILE,${QKTMPDIR}/udhcpd.pid," \ + -e "s,LEASEFILE,${QKTMPDIR}/udhcpd.leases," \ ${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf >${QKTMPDIR}/udhcpd.conf touch ${QKTMPDIR}/udhcpd.leases # ip link set $1 up |