From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 2 Feb 2022 14:24:41 +0000 (+0100)
Subject: improve interface configuration
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/da7dd4b8fd29e26724bf08e774b1fb5c6cfc0ebe

improve interface configuration
---

diff --git a/bootstrap.sh b/bootstrap.sh
index ba03c1a..bd3af5a 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -68,7 +68,7 @@ build_rootfs()
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
-        sudo cp ../../files/eth0 etc/network/interfaces.d/
+        sudo cp ../../files/interfaces etc/network/interfaces
         sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
diff --git a/files/interfaces b/files/interfaces
new file mode 100644
index 0000000..dc11ca9
--- /dev/null
+++ b/files/interfaces
@@ -0,0 +1,10 @@
+# interfaces(5) file used by ifup(8) and ifdown(8)
+# Include files from /etc/network/interfaces.d:
+source /etc/network/interfaces.d/*
+
+auto eth0
+iface eth0 inet dhcp
+
+auto wlan0
+iface wlan0 inet dhcp
+        wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
diff --git a/files/quickstart.txt b/files/quickstart.txt
index 00e6cc1..a3b22ca 100644
--- a/files/quickstart.txt
+++ b/files/quickstart.txt
@@ -10,7 +10,7 @@ tar -C /lib/firmware/ -xf /mnt/linux-firmware.tar
 umount /mnt
 modprobe brcmfmac
 vim /etc/wpa_supplicant/wpa_supplicant.conf
-wpa_supplicant -i <interface> -c /etc/wpa_supplicant/wpa_supplicant.conf
+wpa_supplicant -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf
 dhclient wlan0
 
 # Time
diff --git a/files/wlp1s0f0 b/files/wlp1s0f0
deleted file mode 100644
index 07c2e18..0000000
--- a/files/wlp1s0f0
+++ /dev/null
@@ -1,3 +0,0 @@
-allow-hotplug wlp1s0f0
-iface wlp1s0f0 inet dhcp
-        wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf