Merge pull request #2476 from coreos/oem-vmware

coreos-base/oem-vmware: drop cloud-config

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/cloud-config.yml

@@ -1,33 +0,0 @@
-#cloud-config
-
-coreos:
-  units:
-    - name: vmtoolsd.service
-      command: start
-      content: |
-        [Unit]
-        Description=VMware Tools Agent
-        Documentation=http://open-vm-tools.sourceforge.net/
-        ConditionVirtualization=vmware
-
-        [Service]
-        ExecStartPre=/usr/bin/ln -sfT /usr/share/oem/vmware-tools /etc/vmware-tools
-        ExecStart=/usr/share/oem/bin/vmtoolsd
-        TimeoutStopSec=5
-
-    - name: oem-cloudinit.service
-      command: restart
-      runtime: yes
-      content: |
-        [Unit]
-        Description=Cloudinit from VMware Backdoor
-
-        [Service]
-        Type=oneshot
-        ExecStart=/usr/bin/coreos-cloudinit --oem=vmware
-
-  oem:
-    bug-report-url: "https://issues.coreos.com"
-    id: vmware
-    name: VMWare
-    version-id: "@@OEM_VERSION_ID@@"

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release

@@ -0,0 +1,5 @@
+ID=vmware
+VERSION_ID=@@OEM_VERSION_ID@@
+NAME="VMware"
+HOME_URL="https://www.vmware.com/"
+BUG_REPORT_URL="https://issues.coreos.com"

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/units/vmtoolsd.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=VMware Tools Agent
+Documentation=http://open-vm-tools.sourceforge.net/
+ConditionVirtualization=vmware
+
+[Service]
+ExecStartPre=/usr/bin/ln -sfT /usr/share/oem/vmware-tools /etc/vmware-tools
+ExecStart=/usr/share/oem/bin/vmtoolsd
+TimeoutStopSec=5
+
+[Install]
+WantedBy=multi-user.target

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r5.ebuild

@@ -22,11 +22,12 @@ S="${WORKDIR}"
 
 src_prepare() {
 	sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-		"${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die
+		"${FILESDIR}/oem-release" > "${T}/oem-release" || die
 }
 
 src_install() {
 	insinto "/usr/share/oem"
-	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
+	doins "${T}/oem-release"
+	doins -r "${FILESDIR}/units"
 }