Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  base-files: create empty coremark file
  base-files: fix OpenWrt with Docker will cause NAT loopback (coolsnowwolf#11588)
  • Loading branch information
github-actions[bot] committed Oct 16, 2023
2 parents 2836682 + 8c39e48 commit 43f54b5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 4 additions & 0 deletions package/base-files/files/etc/sysctl.conf
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions package/base-files/files/lib/preinit/80_mount_root
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 43f54b5

Please sign in to comment.