From 8c48ab20168b51fa3893ad64bccd06411f205bb5 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 15 Jul 2020 11:23:14 -0400
Subject: [talkingparabola] sync with talkingarch

talking-arch isn't completely synced with Arch's releng, however I prefer to wait for them to do it, as they may introduce
different stuff, or who knows :P

Signed-off-by: David P <megver83@parabola.nu>
---
 configs/talkingparabola/airootfs/etc/resolv.conf          |  1 +
 .../airootfs/etc/systemd/network/ethernet.network         | 11 +++++++++++
 .../airootfs/etc/systemd/network/wireless.network         | 11 +++++++++++
 .../airootfs/etc/udev/rules.d/81-dhcpcd.rules             |  1 -
 .../talkingparabola/airootfs/root/.automated_script.sh    |  2 +-
 .../talkingparabola/airootfs/root/customize_airootfs.sh   |  4 +++-
 .../airootfs/usr/share/livecd-sound/asound.conf.in        | 15 +++------------
 7 files changed, 30 insertions(+), 15 deletions(-)
 create mode 120000 configs/talkingparabola/airootfs/etc/resolv.conf
 create mode 100644 configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network
 create mode 100644 configs/talkingparabola/airootfs/etc/systemd/network/wireless.network
 delete mode 100644 configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules

(limited to 'configs/talkingparabola/airootfs')

diff --git a/configs/talkingparabola/airootfs/etc/resolv.conf b/configs/talkingparabola/airootfs/etc/resolv.conf
new file mode 120000
index 0000000..3639662
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/resolv.conf
@@ -0,0 +1 @@
+/run/systemd/resolve/stub-resolv.conf
\ No newline at end of file
diff --git a/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network b/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network
new file mode 100644
index 0000000..5e9f0b7
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network
@@ -0,0 +1,11 @@
+[Match]
+Name=en*
+Name=eth*
+
+[Network]
+DHCP=ipv4
+IPv6PrivacyExtensions=yes
+IPv6AcceptRA=false
+
+[DHCP]
+RouteMetric=512
diff --git a/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network b/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network
new file mode 100644
index 0000000..5a6da15
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network
@@ -0,0 +1,11 @@
+[Match]
+Name=wlp*
+Name=wlan*
+
+[Network]
+DHCP=ipv4
+IPv6PrivacyExtensions=yes
+IPv6AcceptRA=false
+
+[DHCP]
+RouteMetric=1024
diff --git a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules
deleted file mode 100644
index 1c4053c..0000000
--- a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"
diff --git a/configs/talkingparabola/airootfs/root/.automated_script.sh b/configs/talkingparabola/airootfs/root/.automated_script.sh
index 81a98a1..aaf5583 100755
--- a/configs/talkingparabola/airootfs/root/.automated_script.sh
+++ b/configs/talkingparabola/airootfs/root/.automated_script.sh
@@ -15,7 +15,7 @@ automated_script ()
     local script rt
     script="$(script_cmdline)"
     if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
-        if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
+        if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
             wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
             rt=$?
         else
diff --git a/configs/talkingparabola/airootfs/root/customize_airootfs.sh b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
index 64c48a9..66679b2 100755
--- a/configs/talkingparabola/airootfs/root/customize_airootfs.sh
+++ b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
@@ -10,6 +10,8 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 usermod -s /usr/bin/zsh root
 cp -aT /etc/skel/ /root/
 chmod 700 /root
+# unset the root password
+passwd -d root
 
 sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
 sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
@@ -19,7 +21,7 @@ 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
 
-systemctl enable multi-user.target pacman-init.service choose-mirror.service livecd-alsa-unmuter.service brltty.service
+systemctl enable multi-user.target pacman-init.service choose-mirror.service systemd-networkd.service systemd-resolved.service livecd-alsa-unmuter.service brltty.service
 systemctl set-default multi-user.target
 
 sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in b/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
index 851f829..3f9c7aa 100644
--- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
+++ b/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
@@ -1,12 +1,3 @@
-pcm.!default {
-	type plug
-	slave.pcm {
-		type hw
-		card %card%
-	}
-}
-
-ctl.!default {
-	type hw
-	card %card%
-}
+Defaults node
+defaults.ctl.card %card%;
+defaults.pcm.card %card%;
-- 
cgit v1.2.2