From efd0d23dd2a2fc656a182c0c48538e276ac1399e Mon Sep 17 00:00:00 2001
From: Marcos Mello <marcosfrm@gmail.com>
Date: Mon, 29 Jun 2020 15:37:29 -0300
Subject: [PATCH] Drop netctl in favor of systemd-networkd and systemd-resolved

* Following upstream archiso

* NetworkManager stays as default in SystemRescueCd

* Explicitly symlink /etc/resolv.conf to /run/NetworkManager/resolv.conf
  to make clear NetworkManager is in charge

Closes fdupoux/sysresccd-src#75
---
 airootfs/etc/systemd/network/20-ethernet.network | 10 ++++++++++
 airootfs/etc/systemd/network/20-wireless.network | 10 ++++++++++
 airootfs/root/customize_airootfs.sh              |  3 +++
 packages                                         |  5 ++---
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 airootfs/etc/systemd/network/20-ethernet.network
 create mode 100644 airootfs/etc/systemd/network/20-wireless.network

diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/airootfs/etc/systemd/network/20-ethernet.network
new file mode 100644
index 0000000..37878b0
--- /dev/null
+++ b/airootfs/etc/systemd/network/20-ethernet.network
@@ -0,0 +1,10 @@
+[Match]
+Name=en*
+Name=eth*
+
+[Network]
+DHCP=yes
+IPv6PrivacyExtensions=yes
+
+[DHCP]
+RouteMetric=512
diff --git a/airootfs/etc/systemd/network/20-wireless.network b/airootfs/etc/systemd/network/20-wireless.network
new file mode 100644
index 0000000..e1d624c
--- /dev/null
+++ b/airootfs/etc/systemd/network/20-wireless.network
@@ -0,0 +1,10 @@
+[Match]
+Name=wlp*
+Name=wlan*
+
+[Network]
+DHCP=yes
+IPv6PrivacyExtensions=yes
+
+[DHCP]
+RouteMetric=1024
diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh
index 01d0ac2..d814534 100755
--- a/airootfs/root/customize_airootfs.sh
+++ b/airootfs/root/customize_airootfs.sh
@@ -23,6 +23,9 @@ 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
 
+# NetworkManager is enabled by default
+ln -sf /run/NetworkManager/resolv.conf /etc/resolv.conf
+
 # PulseAudio takes care of volume restore
 ln -sf /dev/null /etc/udev/rules.d/90-alsa-restore.rules
 
diff --git a/packages b/packages
index ca35128..ee42019 100644
--- a/packages
+++ b/packages
@@ -18,8 +18,8 @@ darkhttpd
 ddrescue
 dhclient
 dialog
-discount
 diffutils
+discount
 dmidecode
 dmraid
 dnsmasq
@@ -30,8 +30,8 @@ e2fsprogs
 efitools
 elinks
 ethtool
-expac
 exfat-utils
+expac
 f2fs-tools
 featherpad
 firefox-esr-bin
@@ -91,7 +91,6 @@ nano
 nbd
 ncdu
 ndisc6
-netctl
 network-manager-applet
 networkmanager-openvpn
 networkmanager-vpnc