From 3358f812eb1c05484a12f287685cef13a7d3d4a0 Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 9 Feb 2022 18:44:49 -0300 Subject: sync with archiso v61 archiso: a814f14 (HEAD -> master, tag: v61, origin/master, origin/HEAD) Add changelog for 61 5b95058 Limit CI pipelines on default branch and merge requests 549ce5b Set all build steps to be interruptable 21ca345 Limit triggering a CI build to change of non-code files cd14387 Add contributing guideline about merge requests 8d2d779 Add info about adding a changelog entry for merge requests 6c1b466 Add the installation of latest archlinux-keyring to CI 720516e configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf: update ExecStart 18bb8c2 configs/*/airootfs/etc/systemd/network/20-ethernet.network: add a comment to document why an interface name glob is used 7cbd25d Merge remote-tracking branch 'origin/merge-requests/228' 8b1788e Add linux-firmware-marvell for Surface Pro 6 wi-fi f822578 Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git 7426192 https://gitlab.archlinux.org/archlinux/archiso/-/issues/163 Signed-off-by: David P --- configs/baseline/airootfs/etc/systemd/network/20-ethernet.network | 3 +++ configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 7 +++++-- .../etc/systemd/system/getty@tty1.service.d/autologin.conf | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network index e8842f2..4b6a2ab 100644 --- a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -1,4 +1,7 @@ [Match] +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 0ac5028..9ada778 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,6 +1,9 @@ [Match] -Type=en* -Type=eth* +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. +Name=en* +Name=eth* [Network] DHCP=yes diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..b9d22eb 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,3 @@ [Service] ExecStart= -ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux +ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root - $TERM -- cgit v1.2.2