diff options
| author | Simon Rettberg | 2015-05-18 18:57:53 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-05-18 18:57:53 +0200 |
| commit | 55f516c323261198f134fda7ac2592510f228290 (patch) | |
| tree | dbc674f04a315ce9554765f8343d6e597c2bde23 /remote/modules | |
| parent | [vmchooser2] Add sessionstart script for logging session name (diff) | |
| parent | [vmware] renamed service dependency to new naming scheme (diff) | |
| download | tm-scripts-55f516c323261198f134fda7ac2592510f228290.tar.gz tm-scripts-55f516c323261198f134fda7ac2592510f228290.tar.xz tm-scripts-55f516c323261198f134fda7ac2592510f228290.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rwxr-xr-x | remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt | 2 | ||||
| -rw-r--r-- | remote/modules/vmware/data/etc/systemd/system/vmware.service | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt index 07f40e0f..cd13ca81 100755 --- a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt @@ -535,7 +535,7 @@ cp "$VMCHOOSER_DIR/data/SHARELWS.BAT" "$VMCHOOSER_DIR/fd-loop/" rm "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" for SHARE in $(grep -o -E '^SLX_SHARE_.*_PATH' /opt/openslx/config); do eval "echo -n \$${SHARE} | /opt/openslx/bin/tr '/' '\' " >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" - eval echo -n " \$${SHARE%PATH}AUTH_PASS /user:\$${SHARE%PATH}AUTH_USER" >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" + #eval echo -n " \$${SHARE%PATH}AUTH_PASS /user:\$${SHARE%PATH}AUTH_USER" >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" echo -e '\r\n' >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" done diff --git a/remote/modules/vmware/data/etc/systemd/system/vmware.service b/remote/modules/vmware/data/etc/systemd/system/vmware.service index 1f47ac8c..696bd581 100644 --- a/remote/modules/vmware/data/etc/systemd/system/vmware.service +++ b/remote/modules/vmware/data/etc/systemd/system/vmware.service @@ -1,7 +1,7 @@ [Unit] Description=Sets up the vmware environment -Requires=vmchooser.service network.target -After=vmchooser.service network.target +Requires=run-virt-env.service network.target +After=run-virt-env.service network.target [Service] Type=oneshot |