diff options
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Ubuntu.pm | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/qemukvm/OpenSLX/OSPlugin/qemukvm.pm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index 15c0a963..c92173b5 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -226,7 +226,7 @@ sub addUclibLdconfig #my $ldpath = shift; open(OUTFILE, ">", "/etc/ld.so.conf.d/uclib.conf") - or die ("something went wrong"); + or die ("unable to create the uclib.conf within ld.so.conf.d"); print OUTFILE "/opt/openslx/uclib-rootfs/lib\n"; print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n"; close(OUTFILE); diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm index a2a397ed..f0f42487 100644 --- a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm @@ -116,4 +116,4 @@ sub finishSession $self->SUPER::finishSession(); } -1;
\ No newline at end of file +1; 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 |