diff options
| author | Dirk | 2013-12-13 18:13:04 +0100 |
|---|---|---|
| committer | Dirk | 2013-12-13 18:13:04 +0100 |
| commit | c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c (patch) | |
| tree | d06acc0585d5b049ca9f6c7de09b282815160520 /remote/modules/vmchooser | |
| parent | Static configuration file for udhcpd sitting on new nat1 bridge interface. (diff) | |
| parent | add linkstate check; add dmesg to stage32 (for debug) (diff) | |
| download | tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.tar.gz tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.tar.xz tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
...
Diffstat (limited to 'remote/modules/vmchooser')
3 files changed, 12 insertions, 3 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index 43880a2c..2d6dfb41 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -485,8 +485,8 @@ else fi if [ -z "$vm_diskfile" ]; then - new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1) - [ -n "$new_vmpath" ] && vmpath="$vmpath$new_vmpath" + new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1) + [ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}" vm_diskfile="$vmpath" fi diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart b/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart new file mode 100755 index 00000000..aa7e54c6 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart @@ -0,0 +1,10 @@ +#!/bin/ash + +SOURCEPATH="/opt/openslx/vmchooser/sessionstart.d" + +if [ -d "$SOURCEPATH" ]; then + for file in $SOURCEPATH/*; do + . "$file" || slxlog "vmchooser-sessionstart" "Could not source $file at session start!" "$file" + done +fi + diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build index 58f5986e..eb0a2d48 100644 --- a/remote/modules/vmchooser/vmchooser.build +++ b/remote/modules/vmchooser/vmchooser.build @@ -1,4 +1,3 @@ -#!/bin/bash fetch_source() { git clone "${REQUIRED_GIT}" src |