root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix network preserving

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-18 09:21:40 +02:00
parent 564ee8ab34
commit 530d028f62
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-network.sh
View file

@ -106,7 +106,7 @@ _network() {
_abort
fi
done
echo "${_INTERFACE}" >/tmp/.network-interface
echo "${_INTERFACE}" >/.network-interface
# iwd renames wireless devices to wlanX
if echo "${_INTERFACE}" | grep -q wlan; then
_CONNECTION="wireless"

2
usr/lib/archboot/installer/autoconfiguration.sh
View file

@ -57,7 +57,7 @@ _auto_network()
fi
_dialog --infobox "Enable network and proxy settings on installed system..." 3 70
# copy iwd keys and enable iwd
if grep -q 'wlan' /tmp/.network-interface; then
if grep -q 'wlan' /.network-interface; then
cp -r /var/lib/iwd "${_DESTDIR}"/var/lib
chroot "${_DESTDIR}" systemctl enable iwd &>"${_NO_LOG}"
fi

1
usr/lib/archboot/update/update.sh
View file

@ -429,6 +429,7 @@ _new_environment() {
rm "${_C_DIR}"/etc/systemd/network/10-wired-auto-dhcp.network
[[ -e '/etc/profile.d/proxy.sh' ]] && cp /etc/profile.d/proxy.sh "${_C_DIR}"/etc/profile.d/proxy.sh
cp /.network "${_C_DIR}"/
cp /.network-interface "${_C_DIR}"/
fi
if [[ -e '/.pacsetup' ]]; then
cp /etc/pacman.conf "${_C_DIR}"/etc