Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions systemd/network/yy-pxe.network
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[Match]
Name=*
Type=!loopback bridge tunnel vxlan wireguard
Driver=!veth dummy
# Only virtual NICs have a Kind, and we want to exclude those.
Kind=!?*
Type=!loopback
KernelCommandLine=!root

[Network]
DHCP=yes
KeepConfiguration=dhcp-on-stop
KeepConfiguration=dynamic-on-stop
IPv6AcceptRA=true

[DHCP]
ClientIdentifier=mac
UseMTU=true
UseDomains=true
ClientIdentifier=mac
7 changes: 4 additions & 3 deletions systemd/network/yy-vmware.network
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[Match]
# Only virtual NICs have a Kind, and we want to exclude those.
Kind=!?*
Type=!loopback
Virtualization=vmware
Type=!loopback dummy bridge tunnel vxlan wireguard
Driver=!veth

[Network]
DHCP=yes
KeepConfiguration=dhcp-on-stop
KeepConfiguration=dynamic-on-stop
IPv6AcceptRA=true

[DHCP]
Expand Down
13 changes: 6 additions & 7 deletions systemd/network/zz-default.network
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[Match]
# Only virtual NICs have a Kind, and we want to exclude those.
Kind=!?*
Type=!loopback

[Network]
DHCP=yes
KeepConfiguration=dhcp-on-stop
KeepConfiguration=dynamic-on-stop
IPv6AcceptRA=true

[Match]
Name=*
Type=!loopback bridge tunnel vxlan wireguard
Driver=!veth tun dummy
Kind=!tun bridge gre veth wireguard

[DHCP]
UseMTU=true
UseDomains=true
Expand Down
4 changes: 2 additions & 2 deletions systemd/system/oem-cloudinit.service
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Description=Run cloudinit
[Service]
EnvironmentFile=/var/run/ignition.env
Type=oneshot
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)"'
ExecCondition=bash -xc 'case ${OEM_ID} in aws|azure|cloudsigma|digitalocean|gcp|openstack|vmware) true;; *) false;; esac'
ExecStart=bash -xc 'exec coreos-cloudinit --oem="$(case ${OEM_ID} in aws|openstack) echo ec2-compat;; gcp) echo gce;; *) printf "%s" "${OEM_ID}";; esac)"'
Comment thread
chewi marked this conversation as resolved.

[Install]
WantedBy=multi-user.target