diff options
| author | Jonathan Bauer | 2018-04-13 18:13:25 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2018-04-13 18:13:25 +0200 |
| commit | 0ed5e3423df24d5edac94288538033b7763f6dbc (patch) | |
| tree | 6c2830b01ebccfb9ab1309881732c08a9f8de514 /core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env | |
| parent | [run-virt] error msg for missing plugin dir (diff) | |
| download | mltk-0ed5e3423df24d5edac94288538033b7763f6dbc.tar.gz mltk-0ed5e3423df24d5edac94288538033b7763f6dbc.tar.xz mltk-0ed5e3423df24d5edac94288538033b7763f6dbc.zip | |
[vbox-src] more vbox plugin fixes
* use HW_CORES from /run/hwinfo
* add usb attach script [WIP]
* udev rule to trigger attach script when usb is connected
* edit_attr -> set_attr now always creating missing nodes/attributes
...and prolly more I cant think of now ...
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env index 1bd0db58..6c7136c5 100755 --- a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env +++ b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env @@ -103,28 +103,9 @@ MEM_SWAPCACHED=$(grep -i "^swapcached:" /proc/meminfo | awk '{print $2}') MEM_TOTAL="$(expr $(expr $MEM_FREE + $MEM_CACHED + $MEM_SWAPCACHED) / 1024)" echo "HOST_MEM_TOTAL=${MEM_TOTAL}" > "${VMCHOOSER_VIRT_CONF}" -# determine number of cpu cores -CPU_CORES=$(grep '^processor.*:' /proc/cpuinfo | wc -l) -if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then - echo "CPU_CORES=${CPU_CORES}" >> "${VMCHOOSER_VIRT_CONF}" -else - echo 'CPU_CORES=1' >> "${VMCHOOSER_VIRT_CONF}" -fi - # general machine architecture (32/64bit) echo "HOST_ARCH=$(uname -m)" >> "${VMCHOOSER_VIRT_CONF}" -# check for VT enabled CPU -if grep -q '^flags.*\<vmx\>' "/proc/cpuinfo"; then - echo "VTFLAG=1" >> "${VMCHOOSER_VIRT_CONF}" - echo 'KVM_MODULE="kvm_intel"' >> "${VMCHOOSER_VIRT_CONF}" - elif grep -q '^flags.*\<svm\>' "/proc/cpuinfo"; then - echo "VTFLAG=1" >> "${VMCHOOSER_VIRT_CONF}" - echo 'KVM_MODULE="kvm_amd"' >> "${VMCHOOSER_VIRT_CONF}" - else - echo "VTFLAG=0" >> "${VMCHOOSER_VIRT_CONF}" -fi - # generated mac address parts from the host's mac address if [ -n "$SLX_PXE_MAC" ]; then HOSTMACADDR="${SLX_PXE_MAC}" @@ -175,6 +156,7 @@ done # Serial ports echo "SERIAL_PORTS='$(dmesg | grep -Eo 'ttyS[0-9]+' | sed 's,^,/dev/,' | tr '\n' ' ')'" >> "${VMCHOOSER_VIRT_CONF}" + # Parallel ports modprobe parport_pc |