From 60e9819077d0b570a48874f5c8ea810f0dd90b1a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 11:52:00 -0700 Subject: [PATCH 01/10] coreos-base/oem-packet: send Content-Type when phoning home --- .../oem-packet/files/units/packet-phone-home.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service index 372cbd904b..d9a885d4bc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service @@ -7,7 +7,7 @@ After=coreos-metadata.service [Service] EnvironmentFile=/run/metadata/coreos Type=oneshot -ExecStart=/usr/bin/curl --request POST "${COREOS_PACKET_PHONE_HOME_URL}" +ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}" [Install] WantedBy=multi-user.target From 10730f3e3a23ceae39ced443fcf41f9f33d4d195 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 11:55:20 -0700 Subject: [PATCH 02/10] coreos-base/oem-packet: retry phoning home until it succeeds --- .../oem-packet/files/units/packet-phone-home.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service index d9a885d4bc..e14c9ffd3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service @@ -6,8 +6,9 @@ After=coreos-metadata.service [Service] EnvironmentFile=/run/metadata/coreos -Type=oneshot ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}" +Restart=on-failure +RestartSec=2 [Install] WantedBy=multi-user.target From 0a4101e2a0cab0324d5b6895d0c2d752b4f3f4ad Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 14:06:15 -0700 Subject: [PATCH 03/10] coreos-base/oem-packet: improve wording of unit description --- .../oem-packet/files/units/packet-phone-home.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service index e14c9ffd3e..2990e457dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service @@ -1,5 +1,5 @@ [Unit] -Description=Basic setup tasks to initialize the machine. +Description=Report Success to Packet ConditionFirstBoot=true Requires=coreos-metadata.service After=coreos-metadata.service From a0bebdd68dc1946ec3ba6b67783317022f427080 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 12:00:03 -0700 Subject: [PATCH 04/10] coreos-base/oem-packet: update console config to match Packet provisioner Our default console settings are fine on arm64 but not on x86. --- .../coreos-overlay/coreos-base/oem-packet/files/grub.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg index 11997a702f..df9fbffaf2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg @@ -1,3 +1,8 @@ # CoreOS GRUB settings set oem_id="packet" + +if [ "$grub_cpu" = i386 ]; then + set linux_console="console=tty0 console=ttyS1,115200n8" + set linux_append="vga=773" +fi From 22113d798304d76aa1b98d6b3ab1324544d268d6 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 12:04:11 -0700 Subject: [PATCH 05/10] coreos-base/oem-packet: enable coreos.autologin Access control for the SOS console uses the same SSH keys that are injected into the instance. The Packet provisioner already enables this option. --- .../coreos-overlay/coreos-base/oem-packet/files/grub.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg index df9fbffaf2..427a9c68b6 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg @@ -1,8 +1,9 @@ # CoreOS GRUB settings set oem_id="packet" +set linux_append="coreos.autologin" if [ "$grub_cpu" = i386 ]; then set linux_console="console=tty0 console=ttyS1,115200n8" - set linux_append="vga=773" + set linux_append="$linux_append vga=773" fi From 0379e5e3367346670856d472479532d2efdb9539 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 20 Jun 2017 16:16:10 -0700 Subject: [PATCH 06/10] coreos-base/oem-packet: replace deprecated vga= argument GRUB warns at boot: vga=773 is deprecated. Use set gfxpayload=1024x768x8,1024x768 before linux command instead. --- .../coreos-overlay/coreos-base/oem-packet/files/grub.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg index 427a9c68b6..2ee931b68f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg @@ -4,6 +4,7 @@ set oem_id="packet" set linux_append="coreos.autologin" if [ "$grub_cpu" = i386 ]; then + set gfxpayload="1024x768x8,1024x768" set linux_console="console=tty0 console=ttyS1,115200n8" - set linux_append="$linux_append vga=773" + set linux_append="$linux_append" fi From 6a199b1bd56e5caaede6ecb0c4c12965a7803a87 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 15 Jun 2017 14:36:19 -0700 Subject: [PATCH 07/10] coreos-base/oem-packet: bump version --- .../{oem-packet-0.1.0.ebuild => oem-packet-0.2.0.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/{oem-packet-0.1.0.ebuild => oem-packet-0.2.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.1.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.2.0.ebuild From b2c6b39ac72e8f1075bd07e9b984562ff4c07cf0 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 30 Jun 2017 18:20:34 -0700 Subject: [PATCH 08/10] sys-apps/baselayout: bump to disable automatic creation of bond0 --- .../{baselayout-3.5.1.ebuild => baselayout-3.6.0.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.5.1.ebuild => baselayout-3.6.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.5.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.5.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index e0803694d1..d6a24c91f9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="1ac2e0306995738fc058aa52b8175bf8aab44d64" + CROS_WORKON_COMMIT="3841ea2e3c433a2f7862fc6388525e69050182ca" KEYWORDS="amd64 arm arm64 x86" fi From 637fc28091d15e84166349477f4826373d39cf27 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 30 Jun 2017 18:34:14 -0700 Subject: [PATCH 09/10] coreos-base/coreos-metadata: bump to v0.12.0 --- ...eos-metadata-0.11.0.ebuild => coreos-metadata-0.12.0.ebuild} | 0 .../coreos-base/coreos-metadata/coreos-metadata-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/{coreos-metadata-0.11.0.ebuild => coreos-metadata-0.12.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.11.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.12.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.11.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.12.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild index 462902eee2..60597328e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild @@ -11,7 +11,7 @@ inherit coreos-go cros-workon systemd if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="e8c92b262cfb32c6b7fe0d0abcc86b9b794248d8" # v0.11.0 + CROS_WORKON_COMMIT="bc0579018fad78f2d46360302724089a6cffa4d3" # v0.12.0 KEYWORDS="amd64 arm64" fi From e39e10d31f023f2c1fa1e7913884fa81266517fd Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 30 Jun 2017 18:36:44 -0700 Subject: [PATCH 10/10] sys-kernel/bootengine: bump for Packet networking via coreos-metadata --- .../{bootengine-0.0.18.ebuild => bootengine-0.0.19.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.18.ebuild => bootengine-0.0.19.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.19.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index be4e66f2fe..d752bb7537 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="439ab2142fad4d272ee016b69bd7066e246f9800" + CROS_WORKON_COMMIT="2fc2c83fb387c5f28b4d9c8e8f7895dd85ccaa90" KEYWORDS="amd64 arm arm64 x86" fi