--- configs/releng/airootfs/etc/systemd/network/dhcp-on-ethernet.network | 5 +++++ configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules | 1 - configs/releng/airootfs/root/customize_airootfs.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 configs/releng/airootfs/etc/systemd/network/dhcp-on-ethernet.network delete mode 100644 configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules diff --git a/configs/releng/airootfs/etc/systemd/network/dhcp-on-ethernet.network b/configs/releng/airootfs/etc/systemd/network/dhcp-on-ethernet.network new file mode 100644 index 0000000..3559b01 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/network/dhcp-on-ethernet.network @@ -0,0 +1,5 @@ +[Match] +Name=eth* en* + +[Network] +DHCP=yes diff --git a/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules deleted file mode 100644 index 1c4053c..0000000 --- a/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service" diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index bf5210c..01d2ee6 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -19,5 +19,5 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf -systemctl enable pacman-init.service choose-mirror.service +systemctl enable pacman-init.service choose-mirror.service systemd-networkd.service systemctl set-default multi-user.target -- 2.9.0