diff options
| author | Jonathan Bauer | 2019-10-24 12:45:48 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-10-24 12:45:48 +0200 |
| commit | 164b9d56d2e85f2194379c9cd1a7b953119387be (patch) | |
| tree | da025826f761e97cb4ec46b53fcf4ca7d045bf64 /core/modules/vmchooser2 | |
| parent | setup_target: formatting (diff) | |
| parent | [vmware-common] Remove any existing usb autoconnect entries (diff) | |
| download | mltk-164b9d56d2e85f2194379c9cd1a7b953119387be.tar.gz mltk-164b9d56d2e85f2194379c9cd1a7b953119387be.tar.xz mltk-164b9d56d2e85f2194379c9cd1a7b953119387be.zip | |
Merge branch 'master' into installer
Diffstat (limited to 'core/modules/vmchooser2')
| -rwxr-xr-x | core/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart b/core/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart index 1cc7eb5f..215077e3 100755 --- a/core/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart +++ b/core/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart @@ -1,5 +1,11 @@ #!/bin/ash +# Give it some time, in case starting the session fails. +# In that case, vmchooser will send us a SIGTERM, which will +# hopefully happen within one second, so we wont't execute +# all the sessionstart hooks. +sleep 1 + SOURCEPATH="/opt/openslx/vmchooser/sessionstart.d" if [ -d "$SOURCEPATH" ]; then |