summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-08-19 15:47:32 +0200
committerDirk von Suchodoletz2009-08-19 15:47:32 +0200
commit835387bf1f6624954529158ee08f2a4dd1486aca (patch)
tree2aed95a88af49e72b8ce7ac469775403dea5855c /os-plugins
parentNo need for the uclibc-wrapper in stage4 any more ... (diff)
downloadcore-835387bf1f6624954529158ee08f2a4dd1486aca.tar.gz
core-835387bf1f6624954529158ee08f2a4dd1486aca.tar.xz
core-835387bf1f6624954529158ee08f2a4dd1486aca.zip
Simple fix (duplicated entry) and improvement for runlevel script.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3108 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm b/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
index dbab8728..9b6fffd2 100644
--- a/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
+++ b/os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm
@@ -134,8 +134,9 @@ sub installationPhase
my $initFile = newInitFile();
$initFile->setDesc("Setup environment for QEMU/KVM");
+
+ $initFile->addToBlock('head','. /etc/opt/openslx/network.qemukvm');
my $do_start = unshiftHereDoc(<<' End-of-Here');
- . /etc/opt/openslx/network.qemukvm
# Adding the tap0 interface to the existing bridge configured in stage3
for i in 0 1 2; do
/opt/openslx/uclib-rootfs/sbin/tunctl -t tap${i} >/dev/null 2>&1
@@ -148,7 +149,6 @@ sub installationPhase
echo "1" >/proc/sys/net/ipv4/conf/tap0/forwarding
End-of-Here
my $do_stop = unshiftHereDoc(<<' End-of-Here');
- . /etc/opt/openslx/network.qemukvm
/opt/openslx/uclib-rootfs/usr/sbin/brctl delif br0 tap0
ip addr del ${nataddress} dev tap1
ip addr del ${hoaddress} dev tap2