diff options
| author | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
| commit | 5027bfbc817dc5620bbc222a47074f99bd340692 (patch) | |
| tree | c7e37f7f2e2f2c87aae2e5cdaa4f1c246b73e1fa /remote/modules/vmware/data | |
| parent | [rootfs-stage32] Remove retarded $PATH declaration from /etc/profile (diff) | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.gz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.xz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmware/data')
| -rw-r--r-- | remote/modules/vmware/data/etc/systemd/system/vmware.service | 4 | ||||
| -rwxr-xr-x | remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/remote/modules/vmware/data/etc/systemd/system/vmware.service b/remote/modules/vmware/data/etc/systemd/system/vmware.service index 30bb42ff..1f47ac8c 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 -After=vmchooser.service +Requires=vmchooser.service network.target +After=vmchooser.service network.target [Service] Type=oneshot diff --git a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env index 4103eae6..175f3bef 100755 --- a/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env +++ b/remote/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env @@ -57,7 +57,7 @@ option dns ${SLX_DNS} option subnet 255.255.255.0 option router CNETWORK.1 option wins CNETWORK.10 -option domain virtual.site ${domain_name} +option domain ${SLX_NET_DOMAIN} virtual.site ${wpad_config} # additional options known to udhcpd |