diff options
| author | Christian Rößler | 2013-08-27 16:24:46 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-08-27 16:24:46 +0200 |
| commit | edca324a111ff2290643f6d954cec042b504ea99 (patch) | |
| tree | aa74a59cee489ef76645b5a451974eaf554f369b /remote | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| parent | [kernel] copy kernel to build dir (diff) | |
| download | tm-scripts-edca324a111ff2290643f6d954cec042b504ea99.tar.gz tm-scripts-edca324a111ff2290643f6d954cec042b504ea99.tar.xz tm-scripts-edca324a111ff2290643f6d954cec042b504ea99.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/kernel/kernel.build | 2 | ||||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 | ||||
| l--------- | remote/targets/stage31/debug | 1 | ||||
| l--------- | remote/targets/stage32/vmplayer | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index 99ee36a2..39077111 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -75,7 +75,7 @@ build() { } post_copy() { - : + cp -a "$MODULE_BUILD_DIR/kernel" "$TARGET_BUILD_DIR/../kernel/kernel" || perror "could not copy kernel to remote build dir" } # helper function to update the current kernel config with our parameters 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 f6e4e491..7e594747 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -439,7 +439,9 @@ unset vm_revision unset dnbd3 if [ -n "$SLX_DNBD3_SERVERS" ]; then if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then - for SRV in $SLX_DNBD3_SERVERS; do + # Shuffle server list + TMP_SERVERS=$(for SRV in $SLX_DNBD3_SERVERS; do echo "$RANDOM $SRV"; done | sort -u | sed -r 's/^[0-9]+ //') + for SRV in $TMP_SERVERS; do dnbd3=$(dnbd3-client -h "$SRV" -i "${vmpath#/mnt/vmstore/}" -r 0) RET=$? if [ "$RET" = "0" ]; then diff --git a/remote/targets/stage31/debug b/remote/targets/stage31/debug deleted file mode 120000 index c05237d6..00000000 --- a/remote/targets/stage31/debug +++ /dev/null @@ -1 +0,0 @@ -../../modules/debug
\ No newline at end of file diff --git a/remote/targets/stage32/vmplayer b/remote/targets/stage32/vmplayer deleted file mode 120000 index 9303aa6a..00000000 --- a/remote/targets/stage32/vmplayer +++ /dev/null @@ -1 +0,0 @@ -../../modules/vmplayer
\ No newline at end of file |