diff options
| author | Simon Rettberg | 2014-04-01 15:35:26 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-04-01 15:35:26 +0200 |
| commit | c189f9ce049cbae19aaad06ae74a642b1e0733d4 (patch) | |
| tree | a1db240f7adba119bc7469474bed73d3cd23bb58 /remote/modules/vmchooser | |
| parent | [vmware/vmchooser] Generalize string cleaning function (diff) | |
| parent | [config curitiba] add curitiba config (diff) | |
| download | tm-scripts-c189f9ce049cbae19aaad06ae74a642b1e0733d4.tar.gz tm-scripts-c189f9ce049cbae19aaad06ae74a642b1e0733d4.tar.xz tm-scripts-c189f9ce049cbae19aaad06ae74a642b1e0733d4.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 5 | ||||
| -rw-r--r-- | remote/modules/vmchooser/module.build (renamed from remote/modules/vmchooser/vmchooser.build) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/module.conf (renamed from remote/modules/vmchooser/vmchooser.conf) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/module.conf.debian (renamed from remote/modules/vmchooser/vmchooser.conf.debian) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/module.conf.opensuse (renamed from remote/modules/vmchooser/vmchooser.conf.opensuse) | 0 | ||||
| -rw-r--r-- | remote/modules/vmchooser/module.conf.ubuntu (renamed from remote/modules/vmchooser/vmchooser.conf.ubuntu) | 0 |
6 files changed, 4 insertions, 1 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 dd6cd84e..ec9f906e 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -482,6 +482,7 @@ cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/" unset vm_diskfile unset vm_revision unset dnbd3 +unset dnbd3error if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DNBD3" = "xyes" ]; then if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then # Shuffle server list @@ -496,9 +497,11 @@ if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DN vmpath="$vm_diskfile" break fi + dnbd3error="$dnbd3error ($RET/$dnbd3)" + usleep 200000 done if [ -z "$vm_diskfile" ]; then - slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS), trying NFS..." + slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS $dnbd3error), trying NFS..." writelog "No working dnbd3 server found :-(" fi else diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/module.build index eb0a2d48..eb0a2d48 100644 --- a/remote/modules/vmchooser/vmchooser.build +++ b/remote/modules/vmchooser/module.build diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/module.conf index 686eb8bf..686eb8bf 100644 --- a/remote/modules/vmchooser/vmchooser.conf +++ b/remote/modules/vmchooser/module.conf diff --git a/remote/modules/vmchooser/vmchooser.conf.debian b/remote/modules/vmchooser/module.conf.debian index 2953ac63..2953ac63 100644 --- a/remote/modules/vmchooser/vmchooser.conf.debian +++ b/remote/modules/vmchooser/module.conf.debian diff --git a/remote/modules/vmchooser/vmchooser.conf.opensuse b/remote/modules/vmchooser/module.conf.opensuse index 75cb7dd6..75cb7dd6 100644 --- a/remote/modules/vmchooser/vmchooser.conf.opensuse +++ b/remote/modules/vmchooser/module.conf.opensuse diff --git a/remote/modules/vmchooser/vmchooser.conf.ubuntu b/remote/modules/vmchooser/module.conf.ubuntu index 2953ac63..2953ac63 100644 --- a/remote/modules/vmchooser/vmchooser.conf.ubuntu +++ b/remote/modules/vmchooser/module.conf.ubuntu |