improve interface configuration

diff --git a/bootstrap.sh b/bootstrap.sh
index ba03c1aad67100b02fa14763ac5bd838235984a8..bd3af5af8135490dd539d9017b54a93f216e3257 100644 (file)
--- 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/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
 
         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 (file)
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 00e6cc1a7577f3d3be4442c76645735643dcc407..a3b22ca35890e7ab960147e31e20f91e48c453ee 100644 (file)
--- 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
 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
 dhclient wlan0
 
 # Time

diff --git a/files/wlp1s0f0 b/files/wlp1s0f0
deleted file mode 100644 (file)
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