From f130b38a488e1835095a6dea7cca7efeb6f98705 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 6 Dec 2018 06:25:13 +0000 Subject: [PATCH] daily autocommit --- .etckeeper | 2 +- network/interfaces | 9 ++------- ...backup_05122018 => interfaces.brwlan0eth0} | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) rename network/{interfaces.backup_05122018 => interfaces.brwlan0eth0} (62%) diff --git a/.etckeeper b/.etckeeper index e6f9098..bdb5152 100755 --- 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 822712b..c767e85 100644 --- 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.brwlan0eth0 similarity index 62% rename from network/interfaces.backup_05122018 rename to network/interfaces.brwlan0eth0 index 7d4e1b2..4f12e1f 100644 --- a/network/interfaces.backup_05122018 +++ b/network/interfaces.brwlan0eth0 @@ -9,14 +9,25 @@ source-directory /etc/network/interfaces.d auto lo iface lo inet loopback -iface eth0 inet dhcp +iface eth0 inet manual up ifconfig eth0 promisc auto wlan0 -allow-hotplug wlan0 -iface wlan0 inet dhcp - wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf + 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 -- 2.43.0