mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-03 19:42:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

wip, fixing c10n

Browse Source
This commit is contained in:
Alex Polvi 2014-03-14 01:03:01 +00:00
parent b46fdb2c3c
commit 5715f652bb
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml vendored
View File

@ -11,7 +11,7 @@ coreos:
[Service]
Type=oneshot
StandardOutput=journal+console
ExecStart=/usr/share/oem/usr/bin/ec2-ssh-key.sh
ExecStart=/usr/share/oem/usr/bin/ec2-ssh-key
- name: ec2-cloudinit.service
runtime: yes
content: |

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n vendored
View File

@ -68,7 +68,7 @@ if head -n 1 $TMP | grep -q '^#!'; then
elif head -n 1 $TMP | grep -q '^#cloud-config'; then
# If an etcd discovery URL was found, we can assume the new hotness
# will handle bootstrapping, allowing us to clear the c10n token
if head -n 1 $TMP | grep -q 'discovery_url:'; then
if grep -q 'discovery_url:' $TMP; then
C10N_TOKEN=""
fi

7
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1.ebuild vendored
View File

@ -16,9 +16,10 @@ IUSE=""
S="${WORKDIR}"
src_install() {
doexe ${FILESDIR}/ec2-ssh-key
doexe ${FILESDIR}/coreos-setup-environment
doexe ${FILESDIR}/coreos-c10n
into "/usr"
dobin ${FILESDIR}/ec2-ssh-key
dobin ${FILESDIR}/coreos-setup-environment
dobin ${FILESDIR}/coreos-c10n
insinto "/"
doins ${FILESDIR}/cloud-config.yml