saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 71d057893cde5045e7f8ccebe573b790723c669b..c5c28f02e06449bd22c7bece290fdf182e7fe4ad 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -927,6 +927,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 0755 'network/interfaces.d'
 maybe chmod 0644 'networks'
 maybe chmod 0755 'newt'

diff --git a/network/interfaces b/network/interfaces
index 7d4e1b2687d5ec2f45590c2f6ea9b359fc2e541f..822712b7e17d6150b27786f2054cf396b67f2a60 100644 (file)
--- a/network/interfaces
+++ b/network/interfaces
@@ -9,7 +9,7 @@ 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
@@ -17,6 +17,11 @@ allow-hotplug wlan0
 iface wlan0 inet dhcp 
     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
new file mode 100644 (file)
index 0000000..7d4e1b2
--- /dev/null
+++ b/network/interfaces.backup_05122018
@@ -0,0 +1,27 @@
+# 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/sysctl.conf b/sysctl.conf
index d9acd92e97a02f6eba9c582f8936d546c608b076..b0773787e56296b25a69b60280a6524a748624b9 100644 (file)
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -25,12 +25,12 @@
 #net.ipv4.tcp_syncookies=1
 
 # Uncomment the next line to enable packet forwarding for IPv4
-#net.ipv4.ip_forward=1
+net.ipv4.ip_forward=1
 
 # Uncomment the next line to enable packet forwarding for IPv6
 #  Enabling this option disables Stateless Address Autoconfiguration
 #  based on Router Advertisements for this host
-#net.ipv6.conf.all.forwarding=1
+net.ipv6.conf.all.forwarding=1
 
 
 ###################################################################