mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 07:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1592 from crawford/pxe

Browse Source 
sys-apps/ignition: remove dependency on OEM part.
This commit is contained in:
Alex Crawford 2015-10-21 17:02:44 -07:00
commit 6f88cd24c3
60 changed files with 69 additions and 56 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-azure/files/grub.cfg vendored
View File

@ -1,5 +1,7 @@
# CoreOS GRUB settings # CoreOS GRUB settings
set oem_id="azure"
# Azure only has a serial console. # Azure only has a serial console.
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 systemd.journald.forward_to_console=yes" set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 systemd.journald.forward_to_console=yes"
serial com0 --speed=115200 --word=8 --parity=no serial com0 --speed=115200 --word=8 --parity=no

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=azure

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.12-r2.ebuild vendored
View File

@ -26,5 +26,4 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/grub.cfg" doins "${FILESDIR}/grub.cfg"
doins "${FILESDIR}/oem-release"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="cloudsigma"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=cloudsigma

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3.ebuild vendored
View File

@ -22,5 +22,5 @@ src_prepare() {
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="cloudstack"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=cloudstack

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.3.ebuild vendored
View File

@ -33,5 +33,5 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="digitalocean"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=digitalocean

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.4.ebuild vendored
View File

@ -22,5 +22,5 @@ src_prepare() {
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings for EC2
set oem_id="brightbox"

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg vendored
View File

@ -1,5 +1,7 @@
# CoreOS GRUB settings for EC2 # CoreOS GRUB settings for EC2
set oem_id="ec2"
# Blacklist the Xen framebuffer module so it doesn't get loaded at boot # Blacklist the Xen framebuffer module so it doesn't get loaded at boot
# Disable `ens3` style names, so eth0 is used for both ixgbevf or xen. # Disable `ens3` style names, so eth0 is used for both ixgbevf or xen.
set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0 systemd.journald.forward_to_console=yes" set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0 systemd.journald.forward_to_console=yes"

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings for EC2
set oem_id="openstack"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-brightbox vendored
View File

@ -1 +0,0 @@
OEM_ID=brightbox

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-ec2 vendored
View File

@ -1 +0,0 @@
OEM_ID=ec2

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/oem-release-openstack vendored
View File

@ -1 +0,0 @@
OEM_ID=openstack

5
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.5.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.6.ebuild vendored
View File

@ -45,10 +45,9 @@ src_install() {
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
if use ec2 ; then if use ec2 ; then
newins "${FILESDIR}/grub-ec2.cfg" grub.cfg newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
newins "${FILESDIR}/oem-release-ec2" oem-release
elif use openstack ; then elif use openstack ; then
newins "${FILESDIR}/oem-release-openstack" oem-release newins "${FILESDIR}/grub-openstack.cfg" grub.cfg
elif use brightbox ; then elif use brightbox ; then
newins "${FILESDIR}/oem-release-brightbox" oem-release newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg
fi fi
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="exoscale"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=exoscale

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.4.ebuild vendored
View File

@ -33,5 +33,5 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg vendored
View File

@ -1,5 +1,7 @@
# CoreOS GRUB settings # CoreOS GRUB settings
set oem_id="gce"
# GCE only has a serial console. # GCE only has a serial console.
set linux_append="systemd.journald.forward_to_console=yes" set linux_append="systemd.journald.forward_to_console=yes"
set linux_console="console=ttyS0,115200n8" set linux_console="console=ttyS0,115200n8"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=gce

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.5.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.6.ebuild vendored
View File

@ -35,5 +35,4 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/grub.cfg" doins "${FILESDIR}/grub.cfg"
doins "${FILESDIR}/oem-release"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="hyperv"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=hyperv

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/oem-hyperv-0.0.3.ebuild vendored
View File

@ -23,5 +23,5 @@ src_prepare() {
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="interoute"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=interoute

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3.ebuild vendored
View File

@ -38,5 +38,5 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="niftycloud"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=niftycloud

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3.ebuild vendored
View File

@ -33,5 +33,5 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="packet"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=packet

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild vendored
View File

@ -26,5 +26,5 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg vendored
View File

@ -1,5 +1,7 @@
# CoreOS GRUB settings # CoreOS GRUB settings
set oem_id="rackspace-onmetal"
# Rackspace wanted a longer timeout, I forget why. (15 seconds) # Rackspace wanted a longer timeout, I forget why. (15 seconds)
set timeout=15 set timeout=15

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=rackspace-onmetal

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.8.ebuild vendored
View File

@ -23,5 +23,4 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/grub.cfg" doins "${FILESDIR}/grub.cfg"
doins "${FILESDIR}/oem-release"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="rackspace"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=rackspace

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild vendored
View File

@ -34,7 +34,7 @@ src_install() {
rsync --exclude=".git" -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die rsync --exclude=".git" -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
into "/usr/share/oem" into "/usr/share/oem"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/coreos-setup-environment"

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="vagrant"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=vagrant

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/oem-vagrant-key-0.0.3.ebuild vendored
View File

@ -18,5 +18,5 @@ S="${WORKDIR}"
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${FILESDIR}/cloud-config.yml" doins "${FILESDIR}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="vagrant"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=vagrant

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild vendored
View File

@ -24,7 +24,7 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins -r "${FILESDIR}/box" doins -r "${FILESDIR}/box"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
into "/usr/share/oem" into "/usr/share/oem"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/coreos-setup-environment"

3
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,3 @@
# CoreOS GRUB settings
set oem_id="vmware"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=vmware

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-9.10.0-r3.ebuild vendored
View File

@ -28,5 +28,5 @@ src_prepare() {
src_install() { src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${FILESDIR}/oem-release" doins "${FILESDIR}/grub.cfg"
} }

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/grub.cfg vendored
View File

@ -1,5 +1,7 @@
# Boot CoreOS as Xen Domain0 # Boot CoreOS as Xen Domain0
set oem_id="xendom0"
set default=coreos-xen set default=coreos-xen
set xen_console="console=vga,com1 com1=115200,8n1" set xen_console="console=vga,com1 com1=115200,8n1"

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/files/oem-release vendored
View File

@ -1 +0,0 @@
OEM_ID=xendom0

1
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-xendom0/oem-xendom0-4.4.1-r2.ebuild vendored
View File

@ -26,5 +26,4 @@ src_install() {
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"
doins "${T}/grub.cfg" doins "${T}/grub.cfg"
doins "${FILESDIR}/oem-release"
} }

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service vendored
View File

@ -5,9 +5,6 @@ DefaultDependencies=false
Requires=local-fs-pre.target Requires=local-fs-pre.target
Before=local-fs-pre.target Before=local-fs-pre.target
Requires=mnt-oem.mount
After=mnt-oem.mount
# setup networking # setup networking
Wants=initrd-systemd-networkd.service Wants=initrd-systemd-networkd.service
After=initrd-systemd-networkd.service After=initrd-systemd-networkd.service
@ -21,6 +18,5 @@ After=disk-uuid.service
[Service] [Service]
Type=oneshot Type=oneshot
Environment=OEM_ID=pxe EnvironmentFile=/run/ignition.env
EnvironmentFile=-/mnt/oem/oem-release
ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service vendored
View File

@ -6,9 +6,6 @@ Before=initrd-parse-etc.service
Requires=initrd-root-fs.target Requires=initrd-root-fs.target
After=initrd-root-fs.target After=initrd-root-fs.target
Requires=mnt-oem.mount
After=mnt-oem.mount
Requires=ignition-disks.service Requires=ignition-disks.service
After=ignition-disks.service After=ignition-disks.service
@ -26,6 +23,5 @@ After=initrd-systemd-resolved.service
[Service] [Service]
Type=oneshot Type=oneshot
Environment=OEM_ID=pxe EnvironmentFile=/run/ignition.env
EnvironmentFile=-/mnt/oem/oem-release
ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files

7
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount vendored
View File

@ -1,7 +0,0 @@
[Unit]
DefaultDependencies=false
Before=initrd-switch-root.target
[Mount]
What=/dev/disk/by-label/OEM
Where=/mnt/oem

1
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.2.1-r1.ebuild vendored Symbolic link
View File

@ -0,0 +1 @@
ignition-9999.ebuild

1
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild vendored
View File

@ -31,7 +31,6 @@ src_compile() {
src_install() { src_install() {
newbin ${GOBIN}/src ${PN} newbin ${GOBIN}/src ${PN}
systemd_dounit "${FILESDIR}"/mnt-oem.mount
systemd_dounit "${FILESDIR}"/ignition.target systemd_dounit "${FILESDIR}"/ignition.target
systemd_dounit "${FILESDIR}"/ignition-disks.service systemd_dounit "${FILESDIR}"/ignition-disks.service
systemd_dounit "${FILESDIR}"/ignition-files.service systemd_dounit "${FILESDIR}"/ignition-files.service