mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix network preserving
This commit is contained in:
parent
564ee8ab34
commit
530d028f62
3 changed files with 3 additions and 2 deletions
|
@ -106,7 +106,7 @@ _network() {
|
||||||
_abort
|
_abort
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo "${_INTERFACE}" >/tmp/.network-interface
|
echo "${_INTERFACE}" >/.network-interface
|
||||||
# iwd renames wireless devices to wlanX
|
# iwd renames wireless devices to wlanX
|
||||||
if echo "${_INTERFACE}" | grep -q wlan; then
|
if echo "${_INTERFACE}" | grep -q wlan; then
|
||||||
_CONNECTION="wireless"
|
_CONNECTION="wireless"
|
||||||
|
|
|
@ -57,7 +57,7 @@ _auto_network()
|
||||||
fi
|
fi
|
||||||
_dialog --infobox "Enable network and proxy settings on installed system..." 3 70
|
_dialog --infobox "Enable network and proxy settings on installed system..." 3 70
|
||||||
# copy iwd keys and enable iwd
|
# 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
|
cp -r /var/lib/iwd "${_DESTDIR}"/var/lib
|
||||||
chroot "${_DESTDIR}" systemctl enable iwd &>"${_NO_LOG}"
|
chroot "${_DESTDIR}" systemctl enable iwd &>"${_NO_LOG}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -429,6 +429,7 @@ _new_environment() {
|
||||||
rm "${_C_DIR}"/etc/systemd/network/10-wired-auto-dhcp.network
|
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
|
[[ -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 "${_C_DIR}"/
|
||||||
|
cp /.network-interface "${_C_DIR}"/
|
||||||
fi
|
fi
|
||||||
if [[ -e '/.pacsetup' ]]; then
|
if [[ -e '/.pacsetup' ]]; then
|
||||||
cp /etc/pacman.conf "${_C_DIR}"/etc
|
cp /etc/pacman.conf "${_C_DIR}"/etc
|
||||||
|
|
Loading…
Reference in a new issue