From 8294692dc843713f90cba386126a3d504a44b03b Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Thu, 20 Oct 2016 16:19:44 -0700
Subject: [PATCH] coreos-base/oem-gce: change some host bind mounts

This drops two mounts that are not needed anymore, since the ACI is
built with emerge and gets those data dependencies now.  It adds a
new mount for home directories to be created.

Two existing mounts remain: one for /etc, and one for /run/systemd
so the /dev/log link works.
---
 .../coreos-base/coreos-oem-gce/files/manifest.in  | 15 +++++----------
 .../oem-gce/files/units/oem-gce.service           |  3 +--
 ...20160906.ebuild => oem-gce-20160906-r1.ebuild} |  0
 3 files changed, 6 insertions(+), 12 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-20160906.ebuild => oem-gce-20160906-r1.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in
index dbc626d7b4..b7a8896f85 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manifest.in
@@ -13,21 +13,16 @@
     "group": "0",
 
     "mountPoints": [
-      {
-        "name": "baselayout",
-        "path": "/usr/share/baselayout",
-        "readOnly": true
-      },
-      {
-        "name": "cacertificates",
-        "path": "/usr/share/ca-certificates",
-        "readOnly": true
-      },
       {
         "name": "etc",
         "path": "/etc",
         "readOnly": false
       },
+      {
+        "name": "home",
+        "path": "/home",
+        "readOnly": false
+      },
       {
         "name": "runsystemd",
         "path": "/run/systemd",
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
index 9e60fb51cd..87c2db80e5 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
@@ -17,9 +17,8 @@ ExecStart=/usr/bin/rkt run \
     --insecure-options=image \
     --net=host \
     --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \
-    --volume=baselayout,kind=host,source=/usr/share/baselayout,readOnly=true \
-    --volume=cacertificates,kind=host,source=/usr/share/ca-certificates,readOnly=true \
     --volume=etc,kind=host,source=/etc,readOnly=false \
+    --volume=home,kind=host,source=/home,readOnly=false \
     --volume=runsystemd,kind=host,source=/run/systemd,readOnly=false \
     /usr/share/oem/coreos-oem-gce.aci
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20160906.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20160906-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20160906.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-20160906-r1.ebuild