diff options
| author | Jonathan Bauer | 2013-10-15 14:04:29 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-10-15 14:04:29 +0200 |
| commit | dcb5997d7a389f1c090b313abd813f3c2cd38bdb (patch) | |
| tree | 82e1b771dae25cb47b9ae2e52fce63db1ad17744 /remote/modules/vmware/data | |
| parent | [mltk] prints missing dev tools. Depending on distro print the possible packa... (diff) | |
| download | tm-scripts-dcb5997d7a389f1c090b313abd813f3c2cd38bdb.tar.gz tm-scripts-dcb5997d7a389f1c090b313abd813f3c2cd38bdb.tar.xz tm-scripts-dcb5997d7a389f1c090b313abd813f3c2cd38bdb.zip | |
[vmware] add the domain information received from the dhcp server to the vmware-dhcp server configuration
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 |