daily autocommit

diff --git a/.etckeeper b/.etckeeper
index e6f9098439c044c9fc19204de523bcd945b34533..bdb51525a733d149794b65fc8ae8078838483ce5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -930,7 +930,7 @@ maybe chmod 0755 'network/if-up.d/upstart'
 maybe chmod 0644 'network/interfaces'
 maybe chmod 0644 'network/interfaces.1479666602'
 maybe chmod 0644 'network/interfaces.1479668150'
-maybe chmod 0644 'network/interfaces.backup_05122018'
+maybe chmod 0644 'network/interfaces.brwlan0eth0'
 maybe chmod 0755 'network/interfaces.d'
 maybe chmod 0644 'networks'
 maybe chmod 0755 'newt'

diff --git a/network/interfaces b/network/interfaces
index 822712b7e17d6150b27786f2054cf396b67f2a60..c767e852eb74f5c37c40890e63260ad9c4033ba9 100644 (file)
--- a/network/interfaces
+++ b/network/interfaces
@@ -13,15 +13,10 @@ iface eth0 inet manual
        up ifconfig eth0 promisc
 
 auto wlan0
-allow-hotplug wlan0
+       allow-hotplug wlan0
 iface wlan0 inet dhcp 
-    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+       wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
 
-auto br0
-iface br0 inet manual 
-bridge_ports eth0 wlan0
-bridge_fd 0
-bridge_stp off
 
 #auto yahmbr0
 #iface yahmbr0 inet dhcp

diff --git a/network/interfaces.backup_05122018 b/network/interfaces.backup_05122018
deleted file mode 100644 (file)
index 7d4e1b2..0000000
--- a/network/interfaces.backup_05122018
+++ /dev/null
@@ -1,27 +0,0 @@
-# interfaces(5) file used by ifup(8) and ifdown(8)
-
-# Please note that this file is written to be used with dhcpcd
-# For static IP, consult /etc/dhcpcd.conf and 'man dhcpcd.conf'
-
-# Include files from /etc/network/interfaces.d:
-source-directory /etc/network/interfaces.d
-
-auto lo
-iface lo inet loopback
-
-iface eth0 inet dhcp 
-       up ifconfig eth0 promisc
-
-auto wlan0
-allow-hotplug wlan0
-iface wlan0 inet dhcp 
-    wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
-
-
-#auto yahmbr0
-#iface yahmbr0 inet dhcp
-#    pre-up ifup wlan0
-#    pre-up ifup eth0
-#    bridge_ports eth0 wlan0
-#    bridge_waitport 0
-#    bridge_fd 0

diff --git a/network/interfaces.brwlan0eth0 b/network/interfaces.brwlan0eth0
new file mode 100644 (file)
index 0000000..4f12e1f
--- /dev/null
+++ b/network/interfaces.brwlan0eth0
@@ -0,0 +1,38 @@
+# interfaces(5) file used by ifup(8) and ifdown(8)
+
+# Please note that this file is written to be used with dhcpcd
+# For static IP, consult /etc/dhcpcd.conf and 'man dhcpcd.conf'
+
+# Include files from /etc/network/interfaces.d:
+source-directory /etc/network/interfaces.d
+
+auto lo
+iface lo inet loopback
+
+iface eth0 inet manual 
+       up ifconfig eth0 promisc
+
+auto wlan0
+       allow-hotplug wlan0
+iface wlan0 inet manual 
+
+auto br0
+       iface br0 inet dhcp 
+       bridge_ports wlan0 eth0
+       bridge_fd 0
+       bridge_stp off
+       bridge_maxwait 5
+#pre-up ifup wlan0
+
+wpa-iface wlan0
+wpa-bridge br0
+wpa-driver nl80211,wext
+wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
+
+#auto yahmbr0
+#iface yahmbr0 inet dhcp
+#    pre-up ifup wlan0
+#    pre-up ifup eth0
+#    bridge_ports eth0 wlan0
+#    bridge_waitport 0
+#    bridge_fd 0