From eb4a83321ccae1b55fe65474b0f1f0f69c06b3a2 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 14 Oct 2013 18:59:19 +0200 Subject: [vmware] Switch from VMware player to workstation, bump version to 10.0 (would be player 6.0) also rename module from vmplayer to vmware to be more generic in case we switch again --- .../etc/systemd/system/graphical.target.wants/vmware.service | 1 + remote/modules/vmware/data/etc/systemd/system/vmware.service | 9 +++++++++ remote/modules/vmware/data/etc/vmware/config | 4 ++++ 3 files changed, 14 insertions(+) create mode 120000 remote/modules/vmware/data/etc/systemd/system/graphical.target.wants/vmware.service create mode 100644 remote/modules/vmware/data/etc/systemd/system/vmware.service create mode 100644 remote/modules/vmware/data/etc/vmware/config (limited to 'remote/modules/vmware/data/etc') diff --git a/remote/modules/vmware/data/etc/systemd/system/graphical.target.wants/vmware.service b/remote/modules/vmware/data/etc/systemd/system/graphical.target.wants/vmware.service new file mode 120000 index 00000000..7deb4820 --- /dev/null +++ b/remote/modules/vmware/data/etc/systemd/system/graphical.target.wants/vmware.service @@ -0,0 +1 @@ +../vmware.service \ No newline at end of file diff --git a/remote/modules/vmware/data/etc/systemd/system/vmware.service b/remote/modules/vmware/data/etc/systemd/system/vmware.service new file mode 100644 index 00000000..30bb42ff --- /dev/null +++ b/remote/modules/vmware/data/etc/systemd/system/vmware.service @@ -0,0 +1,9 @@ +[Unit] +Description=Sets up the vmware environment +Requires=vmchooser.service +After=vmchooser.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/opt/openslx/scripts/systemd-vmware_env start diff --git a/remote/modules/vmware/data/etc/vmware/config b/remote/modules/vmware/data/etc/vmware/config new file mode 100644 index 00000000..eb5d01c0 --- /dev/null +++ b/remote/modules/vmware/data/etc/vmware/config @@ -0,0 +1,4 @@ +.encoding = "UTF-8" +prefvmx.minVmMemPct = "100" +prefvmx.useRecommendedLockedMemSize = "TRUE" +libdir = "/usr/lib/vmware" -- cgit v1.2.3-55-g7522 From dcb5997d7a389f1c090b313abd813f3c2cd38bdb Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 15 Oct 2013 14:04:29 +0200 Subject: [vmware] add the domain information received from the dhcp server to the vmware-dhcp server configuration --- .../modules/vmware/data/etc/systemd/system/vmware.service | 4 ++-- .../vmware/data/opt/openslx/scripts/systemd-vmware_env | 2 +- .../rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx | 13 ++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'remote/modules/vmware/data/etc') 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 diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx index 178e3611..d3310bec 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx @@ -48,7 +48,7 @@ case "$1" in CONF="" if [ -n "$domain" ]; then printf -v CONF "domain $domain\nsearch $domain\n" - elif [ -n "$SLX_NET_DOMAIN" ]; then + elif [ -n "$SLX_NET_DOMAIN" ]; then printf -v CONF "domain $SLX_NET_DOMAIN\nsearch $SLX_NET_DOMAIN\n" fi for i in $dns; do @@ -91,6 +91,17 @@ case "$1" in echo "# Config written by openslx-dhcp-script (1)" >> /opt/openslx/config echo "SLX_HOSTNAME='$dns_host'" >> /opt/openslx/config fi + + # if domain is given from dhcp, save it to openslx config for later use in VMs + if [ -n "$domain" ]; then + # check if SLX_NET_DOMAIN is in the config at all + if grep '^SLX_NET_DOMAIN=' /opt/openslx/config 2>/dev/null; then + sed -i "s/^\(SLX_NET_DOMAIN=\).*$/\1'$domain'/" /opt/openslx/config + else + # not set, add it + echo "SLX_NET_DOMAIN='$domain'" >> /opt/openslx/config + fi + fi # Update /etc/issue for proper spacing /opt/openslx/scripts/openslx-create_issue fi -- cgit v1.2.3-55-g7522