coreos-base/oem-gce: migrate gce to sysext format

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>

Author: tormath1

build_library/vm_image_util.sh

@@ -256,8 +256,10 @@ IMG_iso_MEM=2048
 ## gce, image tarball
 IMG_gce_DISK_LAYOUT=vm
 IMG_gce_CONF_FORMAT=gce
-IMG_gce_OEM_PACKAGE=oem-gce
+IMG_gce_OEM_PACKAGE=common-oem-files
 IMG_gce_OEM_ACI=gce
+IMG_gce_OEM_USE=gce
+IMG_gce_OEM_SYSEXT=oem-gce
 
 ## rackspace
 IMG_rackspace_OEM_PACKAGE=oem-rackspace

sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r4.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r5.ebuild

@@ -31,6 +31,7 @@ fi
 COMMON_OEMIDS=(
     ami
     azure
+    gce
     openstack
     packet
     qemu

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/files/gce/grub.cfg.frag

@@ -1,7 +1,3 @@
-# Flatcar GRUB settings
-
-set oem_id="gce"
-
 # GCE only has a serial console.
 set linux_console="console=ttyS0,115200n8"
 serial com0 --speed=115200 --word=8 --parity=no

sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/gce

@@ -0,0 +1,13 @@
+/etc/systemd/system/multi-user.target.wants/oem-cloudinit.service
+/etc/systemd/system/multi-user.target.wants/oem-gce.service
+/etc/systemd/system/oem-cloudinit.service
+/etc/systemd/system/oem-gce-enable-oslogin.service
+/etc/systemd/system/oem-gce.service
+/etc/systemd/system/sysinit.target.wants/oem-gce-enable-oslogin.service
+/oem/base/
+/oem/bin/
+/oem/files/
+/oem/flatcar-oem-gce.aci
+/oem/units/
+/var/lib/flatcar-oem-gce
+/var/lib/flatcar-oem-gce.img

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/base/README

@@ -0,0 +1,2 @@
+[Unit]
+Upholds=oem-gce-enable-oslogin.service setup-oem.service

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/base/base.ign

@@ -10,7 +10,7 @@ Before=sshd.socket
 Type=oneshot
 RemainAfterExit=true
 
-ExecStart=/oem/bin/enable-oslogin
+ExecStart=/usr/bin/enable-oslogin
 
 [Install]
 WantedBy=sysinit.target

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

@@ -0,0 +1,12 @@
+[Unit]
+Description=Setup OEM
+Before=oem-gce-enable-oslogin.service
+DefaultDependencies=false
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=-/usr/bin/ln --symbolic --force /usr/share/gce/hosts /etc/hosts
+ExecStart=-/usr/bin/ln --symbolic /usr/share/gce/google-cloud-sdk.sh /etc/profile.d/google-cloud-sdk.sh
+[Install]
+WantedBy=sysinit.target