From 6f8340ea982f1756969c15048b7b6589ba50a48f Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 29 Dec 2025 14:37:27 +0000 Subject: [PATCH 1/3] udev: Drop GCE disk rules This is now handled in the app-admin/google-guest-configs package. Signed-off-by: James Le Cuirot --- udev/rules.d/90-cloud-storage.rules | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/udev/rules.d/90-cloud-storage.rules b/udev/rules.d/90-cloud-storage.rules index 920a5a1..a5c8105 100644 --- a/udev/rules.d/90-cloud-storage.rules +++ b/udev/rules.d/90-cloud-storage.rules @@ -3,12 +3,6 @@ ACTION=="remove", GOTO="cloud_storage_end" SUBSYSTEM!="block", GOTO="cloud_storage_end" -# Google GCE by-id -KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}" -KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n" -KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}" -KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n" - ## AWS EBS NVMe names ## https://github.com/coreos/bugs/issues/2399 # NVMe devices @@ -19,6 +13,7 @@ KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Am KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", SYMLINK+="disk/by-id/nvme-$attr{model}_$attr{serial}-ns-$env{_NS_ID}-part%n", OPTIONS+="string_escape=replace" KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", PROGRAM="cloud_aws_ebs_nvme_id -d /dev/%k", SYMLINK+="%c%n" +# GCE is handled in the app-admin/google-guest-configs package. # TODO: Anyone else support friendly names? LABEL="cloud_storage_end" From c7b15df043f8163add8ca9a903febb89995cfcbc Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 30 Apr 2026 17:07:43 +0100 Subject: [PATCH 2/3] Drop support for Equinix Metal (Packet) Signed-off-by: James Le Cuirot --- .../packet-phone-home.service | 1 - systemd/system/oem-cloudinit.service | 2 +- systemd/system/packet-phone-home.service | 20 ------------------- systemd/system/sshkeys.service | 4 ---- tests/coreos-install/positive/general.go | 5 ----- 5 files changed, 1 insertion(+), 31 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/packet-phone-home.service delete mode 100644 systemd/system/packet-phone-home.service diff --git a/systemd/system/multi-user.target.wants/packet-phone-home.service b/systemd/system/multi-user.target.wants/packet-phone-home.service deleted file mode 120000 index e59cf56..0000000 --- a/systemd/system/multi-user.target.wants/packet-phone-home.service +++ /dev/null @@ -1 +0,0 @@ -../packet-phone-home.service \ No newline at end of file diff --git a/systemd/system/oem-cloudinit.service b/systemd/system/oem-cloudinit.service index 69eeb9b..4de29f0 100644 --- a/systemd/system/oem-cloudinit.service +++ b/systemd/system/oem-cloudinit.service @@ -4,7 +4,7 @@ Description=Run cloudinit [Service] EnvironmentFile=/var/run/ignition.env Type=oneshot -ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp rackspace-onmetal azure cloudsigma packet vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"' +ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp rackspace-onmetal azure cloudsigma vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"' ExecStart=/usr/bin/bash -xc '/usr/bin/coreos-cloudinit --oem="$(if [ "${OEM_ID}" = aws -o "${OEM_ID}" = openstack ]; then echo ec2-compat; elif [ "${OEM_ID}" = gcp ]; then echo gce; else echo "${OEM_ID}" ; fi)"' [Install] diff --git a/systemd/system/packet-phone-home.service b/systemd/system/packet-phone-home.service deleted file mode 100644 index 570531c..0000000 --- a/systemd/system/packet-phone-home.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -ConditionKernelCommandLine=|ignition.platform.id=packet -ConditionKernelCommandLine=|flatcar.oem.id=packet -ConditionKernelCommandLine=|coreos.oem.id=packet - -Description=Report Success to Packet -ConditionFirstBoot=true -Wants=coreos-metadata.service -After=coreos-metadata.service - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=/run/metadata/flatcar -ExecStart=/usr/bin/curl -fsSL --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}" -Restart=on-failure -RestartSec=2 - -[Install] -WantedBy=multi-user.target diff --git a/systemd/system/sshkeys.service b/systemd/system/sshkeys.service index eb16382..0e0831b 100644 --- a/systemd/system/sshkeys.service +++ b/systemd/system/sshkeys.service @@ -4,10 +4,6 @@ After=update-ssh-keys-after-ignition.service ConditionPathIsSymbolicLink=!/etc/systemd/system/coreos-metadata-sshkeys@core.service -ConditionKernelCommandLine=|ignition.platform.id=packet -ConditionKernelCommandLine=|flatcar.oem.id=packet -ConditionKernelCommandLine=|coreos.oem.id=packet - ConditionKernelCommandLine=|ignition.platform.id=ec2 ConditionKernelCommandLine=|flatcar.oem.id=ec2 ConditionKernelCommandLine=|coreos.oem.id=ec2 diff --git a/tests/coreos-install/positive/general.go b/tests/coreos-install/positive/general.go index 6e0911f..aafeb1e 100644 --- a/tests/coreos-install/positive/general.go +++ b/tests/coreos-install/positive/general.go @@ -79,11 +79,6 @@ hostname: "coreos1"`), Func: baseTest, OEM: util.StringToPtr("digitalocean"), }) - register.Register(register.Test{ - Name: "OEM - packet", - Func: baseTest, - OEM: util.StringToPtr("packet"), - }) register.Register(register.Test{ Name: "OEM - rackspace", Func: baseTest, From 8298b4b7d63cf6a06de6b2a2235901d2285c57a6 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 30 Apr 2026 17:08:25 +0100 Subject: [PATCH 3/3] Drop support for Rackspace Signed-off-by: James Le Cuirot --- systemd/system/oem-cloudinit.service | 2 +- tests/coreos-install/positive/general.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/systemd/system/oem-cloudinit.service b/systemd/system/oem-cloudinit.service index 4de29f0..86d5ef7 100644 --- a/systemd/system/oem-cloudinit.service +++ b/systemd/system/oem-cloudinit.service @@ -4,7 +4,7 @@ Description=Run cloudinit [Service] EnvironmentFile=/var/run/ignition.env Type=oneshot -ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp rackspace-onmetal azure cloudsigma vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"' +ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp azure cloudsigma vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"' ExecStart=/usr/bin/bash -xc '/usr/bin/coreos-cloudinit --oem="$(if [ "${OEM_ID}" = aws -o "${OEM_ID}" = openstack ]; then echo ec2-compat; elif [ "${OEM_ID}" = gcp ]; then echo gce; else echo "${OEM_ID}" ; fi)"' [Install] diff --git a/tests/coreos-install/positive/general.go b/tests/coreos-install/positive/general.go index aafeb1e..69154ac 100644 --- a/tests/coreos-install/positive/general.go +++ b/tests/coreos-install/positive/general.go @@ -79,11 +79,6 @@ hostname: "coreos1"`), Func: baseTest, OEM: util.StringToPtr("digitalocean"), }) - register.Register(register.Test{ - Name: "OEM - rackspace", - Func: baseTest, - OEM: util.StringToPtr("rackspace"), - }) register.Register(register.Test{ Name: "OEM - vmware_raw", Func: baseTest,