Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ignition: support 'ami' OEM ID. #72

Closed
wants to merge 1 commit into from
Closed

ignition: support 'ami' OEM ID. #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dracut/30ignition/ignition-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if $(cmdline_bool flatcar.first_boot 0) || $(cmdline_bool coreos.first_boot 0);

# On EC2, shut down systemd-networkd if ignition fails so that the instance
# fails EC2 instance checks.
if [[ $(cmdline_arg flatcar.oem.id) == "ec2" ]] || [[ $(cmdline_arg coreos.oem.id) == "ec2" ]]; then
if [[ $(cmdline_arg flatcar.oem.id) == "ec2" ]] || [[ $(cmdline_arg coreos.oem.id) == "ec2" ]] || [[ $(cmdline_arg coreos.oem.id) == "ami" ]] || [[ $(cmdline_arg flatcar.oem.id) == "ami" ]]; then
mkdir -p ${UNIT_DIR}/systemd-networkd.service.d
cat > ${UNIT_DIR}/systemd-networkd.service.d/10-conflict-emergency.conf <<EOF
[Unit]
Expand Down Expand Up @@ -150,7 +150,7 @@ if [[ "${oem_id}" = "${oem_cmdline}" ]]; then
fi

# Ignition changed the platform name to "aws"
if [ "${oem_cmdline}" = "ec2" ]; then
if [ "${oem_cmdline}" = "ec2" ] || [ "${oem_cmdline}" = "ami" ]; then
oem_cmdline="aws"
fi

Expand Down