Merge pull request #2628 from bgilbert/packet

Sync with Packet provisioner
This commit is contained in:
Benjamin Gilbert 2017-06-30 23:29:36 -07:00 committed by GitHub
commit ab20c61d1d
9 changed files with 14 additions and 6 deletions

View File

@ -11,7 +11,7 @@ inherit coreos-go cros-workon systemd
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="e8c92b262cfb32c6b7fe0d0abcc86b9b794248d8" # v0.11.0 CROS_WORKON_COMMIT="bc0579018fad78f2d46360302724089a6cffa4d3" # v0.12.0
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi

View File

@ -1,3 +1,10 @@
# CoreOS GRUB settings # CoreOS GRUB settings
set oem_id="packet" 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"
fi

View File

@ -1,13 +1,14 @@
[Unit] [Unit]
Description=Basic setup tasks to initialize the machine. Description=Report Success to Packet
ConditionFirstBoot=true ConditionFirstBoot=true
Requires=coreos-metadata.service Requires=coreos-metadata.service
After=coreos-metadata.service After=coreos-metadata.service
[Service] [Service]
EnvironmentFile=/run/metadata/coreos EnvironmentFile=/run/metadata/coreos
Type=oneshot ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}"
ExecStart=/usr/bin/curl --request POST "${COREOS_PACKET_PHONE_HOME_URL}" Restart=on-failure
RestartSec=2
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="1ac2e0306995738fc058aa52b8175bf8aab44d64" CROS_WORKON_COMMIT="3841ea2e3c433a2f7862fc6388525e69050182ca"
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="439ab2142fad4d272ee016b69bd7066e246f9800" CROS_WORKON_COMMIT="2fc2c83fb387c5f28b4d9c8e8f7895dd85ccaa90"
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi