diff options
| author | Simon Rettberg | 2013-12-18 18:15:07 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-18 18:15:07 +0100 |
| commit | 59d219f793735de9dcf318862c476c9d676fe03e (patch) | |
| tree | c61fbcddefd591c183b180f101393f775953f7f1 /remote/modules | |
| parent | [rfs-stage32] More verbose error message if udhcpc fails (diff) | |
| parent | doc (diff) | |
| download | tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.tar.gz tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.tar.xz tm-scripts-59d219f793735de9dcf318862c476c9d676fe03e.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
6 files changed, 34 insertions, 5 deletions
diff --git a/remote/modules/qemukvm/data/addon-init b/remote/modules/qemukvm/data/addon-init new file mode 100755 index 00000000..cccc1e8a --- /dev/null +++ b/remote/modules/qemukvm/data/addon-init @@ -0,0 +1,8 @@ +#!/bin/ash + +systemctl daemon-reload +systemctl start qemukvm.service + +# this seems to be necessary due to the misbehaviour of udevd +# in view of the undetected ENV dev_type +systemctl restart systemd-udevd diff --git a/remote/modules/qemukvm/data/etc/systemd/system/graphical.target.wants/qemukvm.service b/remote/modules/qemukvm/data/etc/systemd/system/graphical.target.wants/qemukvm.service new file mode 120000 index 00000000..89d8afbf --- /dev/null +++ b/remote/modules/qemukvm/data/etc/systemd/system/graphical.target.wants/qemukvm.service @@ -0,0 +1 @@ +../qemukvm.service
\ No newline at end of file diff --git a/remote/modules/qemukvm/data/etc/systemd/system/qemukvm.service b/remote/modules/qemukvm/data/etc/systemd/system/qemukvm.service new file mode 100644 index 00000000..8faf5d06 --- /dev/null +++ b/remote/modules/qemukvm/data/etc/systemd/system/qemukvm.service @@ -0,0 +1,9 @@ +[Unit] +Description=Sets up the virtual box environment +Requires=vmchooser.service +After=vmchooser.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/opt/openslx/scripts/systemd-qemukvm_env start diff --git a/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env b/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env index 3173ca45..2d1483aa 100644 --- a/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env +++ b/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env @@ -14,8 +14,14 @@ # - This is the preparation script for the configuration of Linux Qemu/KVM. ################################################################################ + +modprobe kvm +modprobe kvm_amd +modprobe kvm_intel + # check for Linux kvm modules (if required at all) -# lsmod |grep kvm || slxlog "qemukvm-modules" "Cannot find any kvm kernel module(s)" + +lsmod |grep kvm || slxlog "qemukvm-modules" "Cannot find any kvm kernel module(s)" cat >> /etc/sudoers << EOF # allow to start and stop kvm services / load-/unload kvm modules diff --git a/remote/modules/qemukvm/qemukvm.conf b/remote/modules/qemukvm/qemukvm.conf index a3973fe7..32df73a5 100644 --- a/remote/modules/qemukvm/qemukvm.conf +++ b/remote/modules/qemukvm/qemukvm.conf @@ -1,5 +1,11 @@ -REQUIRED_BINARIES=" -" - REQUIRED_DIRECTORIES=" + /etc + /lib + /usr/bin + /usr/sbin + /usr/lib + /usr/share/lintian + /usr/share/qemu + /usr/share/seabios + /usr/share/vgabios " diff --git a/remote/modules/qemukvm/qemukvm.conf.ubuntu b/remote/modules/qemukvm/qemukvm.conf.ubuntu index e42cb63b..d0fdc5f3 100644 --- a/remote/modules/qemukvm/qemukvm.conf.ubuntu +++ b/remote/modules/qemukvm/qemukvm.conf.ubuntu @@ -35,4 +35,3 @@ REQUIRED_CONTENT_PACKAGES=" msr-tools sharutils " -REQUIRED_FILES="" |