diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index ae04212f420b18..e784353dcb33c8 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -1 +1,5 @@ # Defaults are configured in /etc/sysctl.d/* and can be customized in this file + +net.bridge.bridge-nf-call-arptables = 0 +net.bridge.bridge-nf-call-ip6tables = 0 +net.bridge.bridge-nf-call-iptables = 0 diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index 788a6ba47951b7..e78fb867349240 100644 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -17,10 +17,7 @@ missing_lines() { do_mount_root() { mount_root boot_run_hook preinit_mount_root - have_ro_ext4=$(/bin/cat /proc/mounts |/bin/grep ' / ext4'|/bin/grep 'ro'|/usr/bin/wc -l) - if [ "$have_ro_ext4" != "0" ]; then - /usr/bin/mount -o remount,rw,noatime / - fi + [ ! -f /etc/bench.log ] && touch /etc/bench.log [ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && { echo "- config restore -" cp /etc/passwd /etc/group /etc/shadow /tmp