From 4d8ce22e08a89f68699eb25a3891ae57648bba19 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 26 Oct 2018 13:57:18 +0200
Subject: [vbox] Remove old module
---
core/modules/vbox/FIXME | 1 -
core/modules/vbox/README | 30 ---
core/modules/vbox/data/addon-init | 17 --
.../system/graphical.target.wants/vbox.service | 1 -
.../vbox/data/etc/systemd/system/vbox.service | 9 -
.../vbox/data/etc/udev/rules.d/60-vboxdrv.rules | 7 -
.../vbox/data/opt/openslx/scripts/systemd-vbox_env | 56 -----
.../openslx/vmchooser/plugins/virtualbox/README | 1 -
.../vmchooser/plugins/virtualbox/empty-diff.vdi.gz | Bin 285 -> 0 bytes
.../vmchooser/plugins/virtualbox/machine.include | 200 ---------------
.../vmchooser/plugins/virtualbox/run-virt.include | 274 ---------------------
.../vmchooser/plugins/virtualbox/rwimg.vdi.gz | Bin 268 -> 0 bytes
.../vmchooser/plugins/virtualbox/virtualbox.conf | 2 -
.../plugins/virtualbox/virtualbox.include | 59 -----
core/modules/vbox/module.build | 142 -----------
core/modules/vbox/module.conf | 26 --
core/modules/vbox/module.conf.opensuse.12.3 | 20 --
core/modules/vbox/module.conf.ubuntu | 14 --
core/modules/vbox/module.conf.ubuntu.13.04 | 19 --
core/modules/vbox/module.conf.ubuntu.13.10 | 20 --
core/modules/vbox/module.conf.ubuntu.14 | 24 --
core/modules/vbox/module.conf.ubuntu.16 | 24 --
22 files changed, 946 deletions(-)
delete mode 100644 core/modules/vbox/FIXME
delete mode 100644 core/modules/vbox/README
delete mode 100755 core/modules/vbox/data/addon-init
delete mode 120000 core/modules/vbox/data/etc/systemd/system/graphical.target.wants/vbox.service
delete mode 100644 core/modules/vbox/data/etc/systemd/system/vbox.service
delete mode 100644 core/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules
delete mode 100755 core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/README
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/empty-diff.vdi.gz
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include
delete mode 100755 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/rwimg.vdi.gz
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.conf
delete mode 100644 core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include
delete mode 100644 core/modules/vbox/module.build
delete mode 100644 core/modules/vbox/module.conf
delete mode 100644 core/modules/vbox/module.conf.opensuse.12.3
delete mode 100644 core/modules/vbox/module.conf.ubuntu
delete mode 100644 core/modules/vbox/module.conf.ubuntu.13.04
delete mode 100644 core/modules/vbox/module.conf.ubuntu.13.10
delete mode 100644 core/modules/vbox/module.conf.ubuntu.14
delete mode 100644 core/modules/vbox/module.conf.ubuntu.16
(limited to 'core')
diff --git a/core/modules/vbox/FIXME b/core/modules/vbox/FIXME
deleted file mode 100644
index 849f08c2..00000000
--- a/core/modules/vbox/FIXME
+++ /dev/null
@@ -1 +0,0 @@
-Module does not work as of 07.12.2016, kernel module compile error.
diff --git a/core/modules/vbox/README b/core/modules/vbox/README
deleted file mode 100644
index 142bce5e..00000000
--- a/core/modules/vbox/README
+++ /dev/null
@@ -1,30 +0,0 @@
-Patched scripts:
-
-Some virtualbox script are patched to accomodate some changes in system
-environment: As openSLX uses predominantly busybox, paths to busybox exe-
-cutables (respective links) are inserted. These insertions are made at the
-end of paths, as sometimes there are system binaries predomninantly used,
-for example ps, as busybox ps does not offer needed options.
-
-This patched scripts include virtualbox and vboxmanage, originally links
-to VBox. Please note these patched scripts are unlinked, thus solitary,
-please note there is also a (linked) scripts named VBoxManage (note capitals).
-
-It is therefore recommended to use the lower case version (vboxmanage).
-
-
-systemd capabilites:
-
-The systemd-udevd compiled within the module systemd lacks a capability in
-the environment variable DEVTYPE at least in regard to USB devices, so an
-entry ENV{DEVTYPE}=="usb_device" in an udev rule file rule will not work.
-
-This applies to several versions, tested so far 195, 204, 206.
-In contrast to this a hand-copied distribution binary will work flawlessly
-within the openSLX biotope.
-
-It does not seem possible right now to circumvent this problem, as this kind
-of problem seems to be unknown even irc/systemd development group. So as a
-workaround the systemd-udevd will be restarted in addon-init. But the danger
-of losing queue messages needs to be kept in mind, and if a solution arises,
-the udevd restart line should be deleted.
diff --git a/core/modules/vbox/data/addon-init b/core/modules/vbox/data/addon-init
deleted file mode 100755
index afeb8c62..00000000
--- a/core/modules/vbox/data/addon-init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/ash
-
-addgroup vboxusers
-nscd -i group
-# Will be done by PAM now: addgroup demo vboxusers
-
-if grep -q usb_device /proc/devices; then
- mkdir -p -m 0750 /dev/vboxusb 2>/dev/null
- chown root:vboxusers /dev/vboxusb 2>/dev/null
-fi
-
-systemctl daemon-reload
-systemctl start vbox.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/core/modules/vbox/data/etc/systemd/system/graphical.target.wants/vbox.service b/core/modules/vbox/data/etc/systemd/system/graphical.target.wants/vbox.service
deleted file mode 120000
index b8591bd1..00000000
--- a/core/modules/vbox/data/etc/systemd/system/graphical.target.wants/vbox.service
+++ /dev/null
@@ -1 +0,0 @@
-../vbox.service
\ No newline at end of file
diff --git a/core/modules/vbox/data/etc/systemd/system/vbox.service b/core/modules/vbox/data/etc/systemd/system/vbox.service
deleted file mode 100644
index ad7c5739..00000000
--- a/core/modules/vbox/data/etc/systemd/system/vbox.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sets up the virtual box environment
-Requires=vmchooser.service
-After=vmchooser.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/systemd-vbox_env start
diff --git a/core/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules b/core/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules
deleted file mode 100644
index f2caa1cf..00000000
--- a/core/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
-KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
deleted file mode 100755
index 64e138e4..00000000
--- a/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/ash
-# -----------------------------------------------------------------------------
-#
-# Copyright (c) 2016..2018 bwLehrpool-Projektteam
-#
-# This program/file is free software distributed under the GPL version 2.
-# See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
-#
-# If you have any feedback please consult https://bwlehrpool.de and
-# send your feedback to bwlehrpool@hs-offenburg.de.
-#
-# General information about bwLehrpool can be found at https://bwlehrpool.de
-#
-# -----------------------------------------------------------------------------
-# systemd-vbox_env
-# - This is the preparation script for the configuration of VirtualBox.
-################################################################################
-
-export PATH="$PATH":/opt/openslx/bin:/opt/openslx/sbin
-VBOX_CONF_DIR=/opt/openslx/etc/vbox
-VBOXMANAGE=$(which vboxmanage)
-
-# create required standard directories
-mkdir -p "/tmp/virt/virtualbox" -m 1777
-
-# load required Vbox modules
-for module in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko vboxpci.ko ; do
- insmod /lib/modules/vbox/${module} || slxlog "vbox-systemd" "Loading of ${module} failed."
-done
-
-# unload modules if proper systemd shutdown is provided
-#unload_modules () {
-# rmmod vboxpci vboxnetflt vboxnetadp vboxdrv
-#}
-
-# Should be done by udev rule - no mknod needed.
-# mknod -m 0660 /dev/vboxdrv c 10 59
-
-chown root:vboxusers /dev/vboxdrv
-chmod 666 /dev/vboxdrv
-chown root:vboxusers /dev/vboxdrvu
-chmod 666 /dev/vboxdrvu
-chown root:vboxusers /dev/vboxusb
-chmod 755 /dev/vboxusb
-
-# pretty dumb you can just create host-only interfaces, but not assign a specific
-# name/number
-vboxmanage hostonlyif create
-ip link set dev vboxnet0 up
-brctl addif br0 vboxnet0
-vboxmanage hostonlyif create
-ip link set dev vboxnet1 up
-brctl addif nat1 vboxnet1
-vboxmanage hostonlyif create
-ip link set dev vboxnet2 up
-brctl addif vsw2 vboxnet2
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/README b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/README
deleted file mode 100644
index 549d0037..00000000
--- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/README
+++ /dev/null
@@ -1 +0,0 @@
-Not tested since refactoring! (January 2017)
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/empty-diff.vdi.gz b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/empty-diff.vdi.gz
deleted file mode 100644
index c6abbd57..00000000
Binary files a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/empty-diff.vdi.gz and /dev/null differ
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include
deleted file mode 100644
index 532160d1..00000000
--- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include
+++ /dev/null
@@ -1,200 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# Copyright (c) 2010..2018 bwLehrpool-Projektteam
-#
-# This program/file is free software distributed under the GPL version 2.
-# See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
-#
-# If you have any feedback please consult https://bwlehrpool.de and
-# send your feedback to bwlehrpool@hs-offenburg.de.
-#
-# General information about bwLehrpool can be found at https://bwlehrpool.de
-#
-# -----------------------------------------------------------------------------
-# Include file (general template) for run-virt.include of the virtualbox plugin
-
-# TODO: Move this server side (just like vmware)
-# !! A lot of variable names have changed and are NOT updated here !!
-# Oh and for the love of god remove the above comment when this works again
-
-cat << EOF > "${machconfig}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <${network_kind}/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $sharelist
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF
-
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include
deleted file mode 100755
index df7772e8..00000000
--- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include
+++ /dev/null
@@ -1,274 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# Copyright (c) 2009..2018 bwLehrpool-Projektteam
-#
-# This program/file is free software distributed under the GPL version 2.
-# See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
-#
-# If you have any feedback please consult https://bwlehrpool.de and
-# send your feedback to bwlehrpool@hs-offenburg.de.
-#
-# General information about bwLehrpool can be found at https://bwlehrpool.de
-#
-# -----------------------------------------------------------------------------
-# run-virt.include
-# - component for virtualbox of the vmchooser plugin vmchooser-run_virt
-################################################################################
-
-[ -r /run/hwinfo ] && source /run/hwinfo
-
-################################################################################
-### declaration of default variables
-################################################################################
-
-if ! isset VM_CLEANNAME IMG_BASENAME SRC_IMG_ABSOLUTE VM_OS_TYPE; then
- env=$(mktemp)
- env > "$env"
- slxlog -d "virt-vbox-init" "A required variable is not set." "$env"
- writelog "Incomplete variable set passed from main run-virt"
- error_user "Wichtige variablen, die das VBox Plugin benötigt, wurden nicht
-gesetzt. Kann die VM nicht starten."
- cleanexit 1
-fi
-
-# Define which features the VMware plugin supports
-declare -rg PLUGIN_FEATURES="TODO"
-
-declare -rg VMCHOOSERVBOX="/opt/openslx/vmchooser/${PLUGIN_ID}"
-declare -rg VBOX_ROOT="${TMPDIR}/vbox" # dir for configs
-declare -rg VBOX_MACHINES_DIR="${VBOX_ROOT}/Machines"
-declare -rg VBOX_SNAPSHOT_DIR="${VBOX_MACHINES_DIR}/${VM_CLEANNAME}/Snapshots"
-declare -rg VBOX_HDD_DIR="${VBOX_ROOT}/HardDisks"
-declare -rg VBOX_HDD_LINK="${VBOX_HDD_DIR}/${IMG_BASENAME}"
-
-export VBOX_USER_HOME="${VBOX_ROOT}" # instead of $HOME/.VirtualBox
-
-# use VM_CLEANNAME for dir and config names since VM_DISPLAYNAME can be very long
-VBOX_MACHINE_CONFIG="${VBOX_MACHINES_DIR}/${VM_CLEANNAME}/${VM_CLEANNAME}.xml"
-mkdir -p "${VBOX_HDD_DIR}" "${VBOX_SNAPSHOT_DIR}" 2>/dev/null
-enable2d="true" # default setting for accelerated 2D grapics (OS dependent)
-vram="128" # set default graphics ram
-snapshotuuid="34f617be-192a-46b3-a8ae-bce1029e093f" # snapshot UUID is static
-
-# link to image, determine extension (type)
-imgfmt=$(echo ${SRC_IMG_ABSOLUTE##*.} | tr '[a-z]' '[A-Z]')
-if [ -n "$VM_DISKFILE_RW" ]; then
- ln -sf "${VM_DISKFILE_RW}" "${VBOX_HDD_LINK}"
-else
- ln -sf "${VM_DISKFILE_RO}" "${VBOX_HDD_LINK}"
- # image is RO, we only support VDI?
- if [ "$imgfmt" != "VDI" ]; then
- writelog "Image is not VDI, cannot create snapshot.."
- error_log "Die gewählte VM nutzt VBox, hat aber kein VDI image (sondern '$imgfmt'), kann VM nicht starten."
- cleanexit 1
- fi
-fi
-
-
-# Setting some default variables
-SHARED_FOLDERS="TRUE"
-enablevt="true"
-
-# set some base configuration depending on the guest operating system
-case "${VM_OS_TYPE}" in
- Windows31)
- VM_MEM="32"
- vram="16"
- CPU_CORES=1
- enablevt="false"
- SHARED_FOLDERS="FALSE"
- ;;
- WindowsNT)
- VM_MEM="4096"
- vram="16"
- CPU_CORES=4
- enablevt="false"
- SHARED_FOLDERS="FALSE"
- ;;
- Windows95)
- VM_MEM="128"
- vram="32"
- CPU_CORES=1
- enablevt="false"
- SHARED_FOLDERS="FALSE"
- ;;
- Windows98)
- VM_MEM="256"
- vram="64"
- CPU_CORES=1
- SHARED_FOLDERS="FALSE"
- ;;
- WindowsMe)
- VM_MEM="256"
- vram="64"
- CPU_CORES=1
- SHARED_FOLDERS="FALSE"
- ;;
- WindowsXP)
- ;;
- WindowsVista)
- ;;
- Windows7)
- ;;
- Windows8)
- ;;
- OS2eCS)
- VM_MEM="256"
- CPU_CORES=1
- enable2d="false"
- ;;
- MacOS)
- enable2d="false"
- ;;
- Linux*)
- ;;
- *)
- VM_OS_TYPE="Other"
- enable2d="false"
- ;;
-esac
-
-if [ "$HW_KVM" != "ENABLED" ]; then
- enablevt="false"
- CPU_CORES=1 # check for VT, if not available only 1 cpu supported
-fi
-
-writelog "Directories:"
-writelog "\tConfig dir:\t\t$VBOX_ROOT"
-writelog "\tMachines dir:\t\t$VBOX_MACHINES_DIR"
-writelog "\tMachine config:\t\t$VBOX_MACHINE_CONFIG"
-
-################################################################################
-### Hardware checks
-################################################################################
-
-# remove ':' from MAC addr for vbox and generate a VDE (virtual device ethernet)
-# MAC addr from the first one (put in prefix 00DE)
-VM_MAC_ADDR=$(echo ${VM_MAC_ADDR} | sed 's/://g')
-VM_VDE_MAC_ADDR=$(echo ${VM_MAC_ADDR} | sed 's/^..../00DE/g')
-
-machineuuid="00000000-0000-0000-0000-${VM_MAC_ADDR}" # machine UUID, MAC addr part of it
-machineuuid=$(echo ${machineuuid} | tr "[A-Z]" "[a-z]") # cosmetical, since UUID in lower case
-
-# get UUID of VBox image
-diskuuid=$(VBoxManage -q showvdiinfo ${VBOX_HDD_LINK} \
- | grep UUID | grep -v "Parent UUID" | awk '{print $2}' \
- | grep -v use ) # nec. for VBox >= 4
-
-
-if [ -n "$VM_DISKFILE_RW" ]; then
- # Image is already RW - easy
- imgtype="Normal"
- imageuuid=${diskuuid}
-else
- # use temp disk as snapshot to get CoW
- imgtype="Immutable" # make disk immutable
- imageuuid=${snapshotuuid}
- < "${VMCHOOSERVBOX}/empty-diff.vdi.gz" gunzip > "${VBOX_SNAPSHOT_DIR}/{${snapshotuuid}}.vdi"
- # patch the disk file uuid into the snapshot vdi file:
- # We read from offset 424 in the source HDD and write to offset 392 in out prepared
- # CoW container. 16 bytes will be copied, which is the binary UUID
- # TODO: This requires the image to be a vdi/vdh; Afaik, vbox supports vmdk,
- # so this code would break in that case. Can we use the diskuuid we got via
- # VBoxManage, convert to binary, and patch it
- dd if=${VBOX_HDD_LINK} of="${VBOX_SNAPSHOT_DIR}/{${snapshotuuid}}.vdi" seek=424 \
- skip=392 bs=16 count=1 conv=notrunc
-fi
-
-# translate network kinds (nat, bridged, host-only)
-# TODO: Server should prepare this in returned xml
-case "${network_kind}" in
- bridge*)
- network_kind='HostOnlyInterface name="vboxnet0"'
- ;;
- host*)
- network_kind='HostOnlyInterface name="vboxnet2"'
- ;;
- *)
- network_kind='HostOnlyInterface name="vboxnet1"'
-esac
-
-boot="HardDisk"
-
-writelog "\tSnapshots dir:\t\t$VBOX_SNAPSHOT_DIR"
-writelog "Diskimage:"
-writelog "\tDisk file:\t\t$VBOX_HDD_LINK"
-writelog "\tDisk type:\t\t$imgtype"
-writelog "\tVMostype:\t\t$VM_OS_TYPE"
-writelog "\tMachine UUID:\t\t$machineuuid"
-writelog "\tDisk UUID:\t\t$diskuuid"
-writelog "Virtual Hardware:"
-writelog "\tCPU cores:\t\t${CPU_CORES}\c"
-writelog ""
-[ "$HW_KVM" = "ENABLED" ] && writelog " (VT enabled CPU)"
-writelog "\tGuest RAM:\t\t${VM_MEM} MB"
-# echo nur wenn HOST_MEM_REMAINING gesetzt
-[ -n "${HOST_MEM_REMAINING}" ] && writelog "\tHost RAM:\t\t${HOST_MEM_REMAINING} MB"
-writelog "\tMAC address:\t\t$VM_MAC_ADDR"
-writelog "\tNetwork card:\t\t${vb_network_card}"
-writelog "\tNetwork kind:\t\t${network_kind}"
-writelog "\tBooting from:\t\t${boot}\c"
-writelog ""
-writelog "\tCD-ROM1:\t\t${CDROM0}"
-#writelog "\tCD-ROM2:\t\t${CDROM1}"
-writelog "\tFloppy_A:\t\t${floppy0}"
-writelog "\tFloppy_B:\t\t${floppy1}"
-# defined in run-virt.sh and run-vmgrid.sh
-writelog "\tShared Folders '${sharename}':\t${sharepath}"
-
-################################################################################
-### Pepare and configure virtual machine and disk image
-################################################################################
-
-# create Virtualbox.xml
-
-# Shares given?
-if [ "x$SHARED_FOLDERS" != "xFALSE" ]; then
- sharelist="
-
-
- "
-else
- sharelist=''
-fi
-
-source "${VMCHOOSERVBOX}/virtualbox.include" # create Virtualbox.xml
-
-# remove snapshot disk when using rw images
-if [ "${imgtype}" != "Immutable" ]; then
- sed -i "/${snapshotuuid}/d" "${VBOX_ROOT}/VirtualBox.xml"
-fi
-
-# TODO: add rawdisk if requested
-#"raw.vmdk" format="VMDK" type="Writethrough"/>
-
-source "${VMCHOOSERVBOX}/machine.include" # create machine.xml
-
-# remove CD-ROM if not available
-if [ "${CDROM0}" != "TRUE" ]; then
- sed -i "/HostDrive/d" "${VBOX_MACHINE_CONFIG}"
- sed -i '/AttachedDevice.*type="DVD"/d' "${VBOX_MACHINE_CONFIG}"
- sed -i "//d" "${VBOX_MACHINE_CONFIG}"
-fi
-
-################################################################################
-### Set env for vmchooser-run_virt
-################################################################################
-
-# wait for a certain command to settle
-# get the PID of the right process
-# kill PID, seems to work
-VBMANPID=$(pstree -p | grep VBoxXPCOMIPCD | grep -ivE "VirtualBox|VBoxHeadless"\
- | sed -e "s/.*VBoxXPCOMIPCD(\(.*\)).*/\1/")
-for i in $(echo ${VBMANPID}); do
- kill -9 ${VBMANPID} >/dev/null 2>&1
-done
-
-# set the variables appropriately (several interfaces with different names)
-VIRTCMD=$(which VirtualBox 2>/dev/null)
-VIRTCMDOPTS="--startvm ${machineuuid} --start-running --fullscreen"
-
-# set headless mode (-v off to disable vrdp)
-VIRTCMDHL=$(which VBoxHeadless 2>/dev/null)
-VIRTCMDOPTSHL="-s ${machineuuid}"
-
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/rwimg.vdi.gz b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/rwimg.vdi.gz
deleted file mode 100644
index e2133d6d..00000000
Binary files a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/rwimg.vdi.gz and /dev/null differ
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.conf b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.conf
deleted file mode 100644
index 8a7a58e4..00000000
--- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Todo: Good setting
-export VBOX_USER_HOME=""
diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include
deleted file mode 100644
index 5da82b10..00000000
--- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include
+++ /dev/null
@@ -1,59 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# Copyright (c) 2010..2018 bwLehrpool-Projektteam
-#
-# This program/file is free software distributed under the GPL version 2.
-# See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
-#
-# If you have any feedback please consult https://bwlehrpool.de and
-# send your feedback to bwlehrpool@hs-offenburg.de.
-#
-# General information about bwLehrpool can be found at https://bwlehrpool.de
-#
-# -----------------------------------------------------------------------------
-# Include file (general template) for run-virt.include of the virtualbox plugin
-
-cat << EOF > "${VBOX_ROOT}/VirtualBox.xml"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF
diff --git a/core/modules/vbox/module.build b/core/modules/vbox/module.build
deleted file mode 100644
index 0f62eab4..00000000
--- a/core/modules/vbox/module.build
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-
-patch_vbox_scripts() {
- # Patching virtualbox utility scripts to include openslx-busybox binary paths. Strange sed-ing, as the openslx
- # binary paths need to be at the end of PATH to not impede with system binaries.
- # It seems sufficient to patch just VBox, as eg. vboxmanage, vboxheadless etc. are just links to VBox.
- # If only vboxmanage, vboxheadless or such should be patched (and not the base script VBox) just use a list
- # in the loop (eg. 'for i in virtualbox vboxmanage vboxheadless; do'). These links will be replaced by patched
- # 'real' files. Of course it will not make sense if VBox is included in the list, then.
- # Patched files will be saved with extension .original.
-
- pinfo "Patching virtual box scripts to include openslx (busybox)-paths ..."
- for i in VBox; do
- pinfo "Patching virtual box script $i ..."
- SCRIPTPATH=$(grep -m 1 PATH "${MODULE_BUILD_DIR}/usr/bin/$i"|sed 's/"//g') # assume first hit is real path
- sed -i "-i.original" "/^PATH=/c ${SCRIPTPATH}:/opt/openslx/bin:/opt/openslx/sbin"\
- "${MODULE_BUILD_DIR}/usr/bin/$i" # append openslx paths
- done
-
- # due to problems with group membership of kdm-spawned processes we need to
- # patch ${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh:
- sed -i "s/0750/0755/g" "${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh"
- sed -i "s/0660/0666/g" "${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh"
-}
-
-extract_extpack() {
- pinfo "Unpacking Extension Pack ..."
- mkdir -p "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
- cp "${MODULE_WORK_DIR}"/src/vbox/extpack/[EP][xX][tE]* "${MODULE_BUILD_DIR}"/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
- if [ x${AMD64_X86} == "xamd64" ]; then
- pinfo "Unpacking 64bit branch of Extension Pack ..."
- cp -r "${MODULE_WORK_DIR}/src/vbox/extpack/linux.amd64" "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
- else # then we assume 32bit x86...
- pinfo "Unpacking32bit branch of Extension Pack ..."
- cp -r "${MODULE_WORK_DIR}/src/vbox/extpack/linux.x86" "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
- fi
-}
-
-build_modules() {
- pinfo "Recompiling VirtualBox kernel modules ..."
- # Set some variables to use/patch VBox scripts
- local MODULE_SRC="${MODULE_BUILD_DIR}/usr/share/virtualbox/src/vboxhost"
- local BUILDINTMP="$MODULE_SRC/build_in_tmp"
- local BUILDSUBDIR="modules"
-
- # Some Vars for VBs kernel module makefiles
- MODULE_DIR_ALT="$MODULE_DIR" # save usual MODULE_DIR
- export KERN_DIR="${MODULE_WORK_DIR}/../kernel/build/lib/modules/$(ls ${MODULE_WORK_DIR}/../kernel/build/lib/modules/)/build/"
- pinfo "Using Kernel dir $KERN_DIR"
- # export MODULE_DIR="${MODULE_WORK_DIR}/../kernel/build/lib/modules/$(ls ${MODULE_WORK_DIR}/../kernel/build/lib/modules/)/kernel/misc"
- export MODULE_DIR="${MODULE_WORK_DIR}/build/lib/modules/vbox"
-
- pinfo "Recompiling VirtualBox kernel module vboxdrv ..."
- if ! $BUILDINTMP \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxdrv" \
- --no-print-directory install;
- then
- perror "[vbox]: Error compiling VirtualBox kernel module vboxdrv"
- fi
- pinfo "Recompiling VirtualBox kernel module vboxnetflt ..."
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxnetflt" \
- --no-print-directory install;
- then
- perror "[vbox]: Error compiling VirtualBox kernel module vboxnetflt"
- fi
- pinfo "Recompiling VirtualBox kernel module vboxnetadp ..."
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxnetadp" \
- --no-print-directory install;
- then
- perror "[vbox]: Error compiling VirtualBox kernel module vboxnetadp"
- fi
- pinfo "Recompiling VirtualBox kernel module vboxpci ..."
- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --module-source "$MODULE_SRC/vboxpci" \
- --no-print-directory install;
- then
- perror "[vbox]: Error compiling VirtualBox kernel module vboxpci"
- fi
- pinfo "Compiled successfully the VirtualBox kernel modules."
- export MODULE_DIR="$MODULE_DIR_ALT" # re-set MODULE_DIR
-}
-
-
-fetch_source() {
- if [ -z "$REQUIRED_VBOXBASEURL" -o -z "$REQUIRED_VBOXEXTURL" ]; then
- perror "Virtualbox download URLs not set - please write a module.conf-file for your linux flavour."
- fi
-
- mkdir -p "src/vbox"
- cd src/vbox
- # pinfo "Downloading $REQUIRED_VBOXBASEURL"
- download "$REQUIRED_VBOXBASEURL"
- # pinfo "Downloading $REQUIRED_VBOXEXTURL"
- download_untar "$REQUIRED_VBOXEXTURL" "extpack" "vbox_extpack.tar.gz"
- cd -
-}
-
-
-build() {
- case "$PACKET_HANDLER" in
- rpm)
- pinfo "Unpacking rpm ..."
- cd build || perror "Cannot cd to build directory!"
- rpm2cpio ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL")|cpio -idmv || perror "Could not unpack rpm-archive!"
- # it seems that sometimes directories from rpm will be created with 700-permissions,
- # if that directory is not explicitly mentioned to create. So eg. usr, etc will carry the
- # permissions 700, which is no fun. So we search for these directories and correct them.
- find . -type d -perm 700 -exec chmod 755 {} \;
- ;;
- dpkg )
- pinfo "Unpacking deb ..."
- cd build || perror "Cannot cd to build directory!"
- dpkg -x ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL") . || perror "Could not unpack deb-archive!"
- # VirtualBox needs to be suid-root:
- for i in VBoxHeadless VBoxNetAdpCtl VBoxNetDHCP VBoxSDL VBoxVolInfo VirtualBox VBoxNetAdpCtl; do
- chmod u+s ${MODULE_BUILD_DIR}/usr/lib/virtualbox/$i || pwarning "(Debian/Ubuntu) Could not suid $i executable!"
- done
- ;;
- *) perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target" ;;
- esac
-
- build_modules
- patch_vbox_scripts
- extract_extpack
-
- COPYLIST="list_dpkg_output"
- [ -e "$COPYLIST" ] && rm "$COPYLIST"
- list_packet_files >> "$COPYLIST"
- tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
-}
-
-post_copy() {
- # clean a bit, as sometimes there are residual files in /tmp/vbox.*/
- rm -rf /tmp/vbox.*/
-}
-
diff --git a/core/modules/vbox/module.conf b/core/modules/vbox/module.conf
deleted file mode 100644
index cd7762ff..00000000
--- a/core/modules/vbox/module.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# VBox version 5 branch:
-# REQUIRED_VBOX_VERSION_MAJOR="5.0"
-# REQUIRED_VBOX_VERSION_MINOR="0"
-# REQUIRED_VBOX_VERSIONCODE="101573"
-
-# VBox version 4 last branch:
-REQUIRED_VBOX_VERSION_MAJOR="4.3"
-REQUIRED_VBOX_VERSION_MINOR="26"
-REQUIRED_VBOX_VERSIONCODE="98988"
-
-# TODO: retest ssc's test with
-#REQUIRED_VBOX_VERSION_MAJOR="5.0"
-#REQUIRED_VBOX_VERSION_MINOR="16"
-#REQUIRED_VBOX_VERSIONCODE="105871"
-
-REQUIRED_VBOX_VERSION="$REQUIRED_VBOX_VERSION_MAJOR.$REQUIRED_VBOX_VERSION_MINOR"
-
-REQUIRED_DIRECTORIES="
- /etc
- /lib
- /usr
-"
-# REQUIRED_LDD_BLACKLIST: Keep in mind the leading '\|'!
-REQUIRED_LDD_BLACKLIST="\|VBoxVMM"
-
diff --git a/core/modules/vbox/module.conf.opensuse.12.3 b/core/modules/vbox/module.conf.opensuse.12.3
deleted file mode 100644
index 29a0e2ab..00000000
--- a/core/modules/vbox/module.conf.opensuse.12.3
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-REQUIRED_VBOX_OSCODE='openSUSE123-1'
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/VirtualBox-${REQUIRED_VBOX_VERSION_MAJOR}-${REQUIRED_VBOX_VERSION}_${REQUIRED_VBOX_VERSIONCODE}_${REQUIRED_VBOX_OSCODE}.${X86_64_I586}.rpm"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-REQUIRED_CONTENT_PACKAGES="
- libSDL-1_2-0
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libSDL-1_2-0
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libSDL-1.2
- libpng12
-"
diff --git a/core/modules/vbox/module.conf.ubuntu b/core/modules/vbox/module.conf.ubuntu
deleted file mode 100644
index 75b73bad..00000000
--- a/core/modules/vbox/module.conf.ubuntu
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libpng12
-"
diff --git a/core/modules/vbox/module.conf.ubuntu.13.04 b/core/modules/vbox/module.conf.ubuntu.13.04
deleted file mode 100644
index e8b7f875..00000000
--- a/core/modules/vbox/module.conf.ubuntu.13.04
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-REQUIRED_VBOX_OSCODE='Ubuntu~raring'
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-REQUIRED_CONTENT_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libpng12
-"
diff --git a/core/modules/vbox/module.conf.ubuntu.13.10 b/core/modules/vbox/module.conf.ubuntu.13.10
deleted file mode 100644
index 653716d5..00000000
--- a/core/modules/vbox/module.conf.ubuntu.13.10
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-REQUIRED_VBOX_OSCODE='Ubuntu~raring' # raring: 13.04, but also used here.
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-
-REQUIRED_CONTENT_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libpng12
-"
diff --git a/core/modules/vbox/module.conf.ubuntu.14 b/core/modules/vbox/module.conf.ubuntu.14
deleted file mode 100644
index fb839468..00000000
--- a/core/modules/vbox/module.conf.ubuntu.14
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# VBox version 5 branch:
-# REQUIRED_VBOX_OSCODE='Ubuntu~trusty'
-
-# VBox version 4 last branch:
-REQUIRED_VBOX_OSCODE='Ubuntu~raring'
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-
-REQUIRED_CONTENT_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libpng12
-"
diff --git a/core/modules/vbox/module.conf.ubuntu.16 b/core/modules/vbox/module.conf.ubuntu.16
deleted file mode 100644
index f5856631..00000000
--- a/core/modules/vbox/module.conf.ubuntu.16
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# VBox version 5 branch:
-# REQUIRED_VBOX_OSCODE='Ubuntu~trusty'
-
-# VBox version 4 last branch:
-REQUIRED_VBOX_OSCODE='Ubuntu~wily'
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-
-REQUIRED_CONTENT_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
- libsdl1.2debian
- libpng12-0
-"
-
-REQUIRED_LIBRARIES="
- libpng12
-"
--
cgit v1.2.3-55-g7522