Skip to content

Commit 2c7b250

Browse files
committed
Merge branch 'dev' into pipewire
2 parents b04e225 + 50af988 commit 2c7b250

4 files changed

Lines changed: 9 additions & 44 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[Seat:*]
2-
autologin-session=lxde
2+
autologin-session=LXDE
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Seat:*]
2+
autologin-session=xfce

system/initcpio/archiso_shutdown

Lines changed: 0 additions & 39 deletions
This file was deleted.

system/initcpio/hooks/archiso_pxe_common

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ run_latehook () {
6767
# shellcheck disable=SC2154
6868
# defined via initcpio's parse_cmdline()
6969
if [ "${copytoram}" = "y" ]; then
70-
if [ -n "${bootif_dev}" ]; then
71-
ip addr flush dev "${bootif_dev}"
72-
ip link set "${bootif_dev}" down
73-
fi
70+
for curif in /sys/class/net/*; do
71+
netdev=${curif#/sys/class/net/}
72+
ip addr flush dev "${netdev}"
73+
ip link set "${netdev}" down
74+
done
7475
elif [ "${copy_resolvconf}" != "n" ] && [ -f /etc/resolv.conf ]; then
76+
rm -f /new_root/etc/resolv.conf
7577
cp /etc/resolv.conf /new_root/etc/resolv.conf
7678
fi
7779
fi

0 commit comments

Comments
 (0)