aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile8
-rwxr-xr-xpackage/base-files/default/etc/init.d/S45firewall7
-rwxr-xr-xpackage/base-files/default/sbin/mount_root2
3 files changed, 10 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e4753d045c..2604e62578 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -52,7 +52,7 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_BASE):
$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
- cp -a ./default/* $(IDIR_BASE)
+ $(CP) ./default/* $(IDIR_BASE)
$(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
$(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf
mkdir -p $(IDIR_BASE)/sys
@@ -77,8 +77,8 @@ $(IPKG_UCLIBC):
$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(IDIR_UCLIBC)/lib
for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
- cp -fpR $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
- cp -fpR $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \
+ $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
+ $(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \
done
-$(STRIP) $(IDIR_UCLIBC)/lib/*
$(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR)
@@ -86,7 +86,7 @@ $(IPKG_UCLIBC):
$(IPKG_LIBGCC):
$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(IDIR_LIBGCC)/lib
- cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
+ $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/
-$(STRIP) $(IDIR_LIBGCC)/lib/*
$(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 8789fbab60..0110cfc775 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,8 +81,11 @@ iptables -t nat -N postrouting_rule
iptables -A FORWARD -j forwarding_rule
# allow
- iptables -A FORWARD -i br0 -o br0 -j ACCEPT
-
+ # if there is bridge splitting this workaround works too
+ for iface in $LAN; do
+ iptables -A FORWARD -i $iface -o $iface -j ACCEPT
+ [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+ done
# reject (what to do with anything not allowed earlier)
# uses the default -P DROP
diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index 427ff0444f..693c694c1b 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then
pivot_root /jffs /jffs/rom
mount none /proc -t proc
mount none /dev -t devfs
- umount /rom/proc /rom/dev >&-
+ umount /rom/proc rom/dev >&-
fi
fi
fi