From 53edda1e3668752d18b2bbf4c3d6edc7e3ab1b6e Mon Sep 17 00:00:00 2001 From: mirko Date: Wed, 19 Dec 2012 16:07:46 +0000 Subject: Do not overload mount-call - trying to reduce confusion The behaviour of calling 'mount' differed depending on whether it called the busybox-mount, the mount of util-linux, the mount defined in /lib/functions.sh and /lib/functions/boot.sh /etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh, both re-defining 'mount'. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34792 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 2 +- package/base-files/files/etc/init.d/usb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 43837a80f..ef97383d8 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -66,7 +66,7 @@ start() { touch /var/log/lastlog touch /tmp/resolv.conf.auto ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf - grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug + grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe load_modules /etc/modules.d/* diff --git a/package/base-files/files/etc/init.d/usb b/package/base-files/files/etc/init.d/usb index 7b443b651..43cdfd9a9 100755 --- a/package/base-files/files/etc/init.d/usb +++ b/package/base-files/files/etc/init.d/usb @@ -4,6 +4,6 @@ START=39 start() { [ -d /proc/bus/usb ] && { - /bin/mount -t usbfs none /proc/bus/usb + mount -o noatime -t usbfs none /proc/bus/usb } } -- cgit v1.2.3 From c8e772f18ff31566e342cd44fbd7a6b2bc11efb2 Mon Sep 17 00:00:00 2001 From: mirko Date: Wed, 19 Dec 2012 16:07:53 +0000 Subject: merge /lib/functions/boot.sh and /lib/functions.sh git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34794 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/preinit | 1 - 1 file changed, 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 0fdfa8cf8..b237c2e06 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -22,7 +22,6 @@ pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin" pi_init_cmd="/sbin/init" . /lib/functions.sh -. /lib/functions/boot.sh boot_hook_init preinit_essential boot_hook_init preinit_main -- cgit v1.2.3 From f1b689a9f44e1bc8cb3953d3abc4758fc5860447 Mon Sep 17 00:00:00 2001 From: luka Date: Thu, 20 Dec 2012 15:15:30 +0000 Subject: [package] base-files: we don't need /etc/functions.sh symlink anymore git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34802 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/functions.sh | 1 - 1 file changed, 1 deletion(-) delete mode 120000 package/base-files/files/etc/functions.sh (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh deleted file mode 120000 index 13b3190e7..000000000 --- a/package/base-files/files/etc/functions.sh +++ /dev/null @@ -1 +0,0 @@ -../lib/functions.sh \ No newline at end of file -- cgit v1.2.3 From c0a700469527138643d745c7a17ba66e86e77a52 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Dec 2012 18:56:09 +0000 Subject: base-files: add basic procd integration, let procd start (and restart) ubus instead of having an ubus init script git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34866 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/rc.common | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index fa2df6cd2..78e2dd494 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -75,10 +75,41 @@ $EXTRA_HELP EOF } +# for procd +start_service() { + return 0 +} + +stop_service() { + return 0 +} + ${INIT_TRACE:+set -x} . "$initscript" +[ -n "$USE_PROCD" ] && { + . $IPKG_INSTROOT/lib/functions/procd.sh + + rc_procd() { + procd_open_service "$(basename "$initscript")" "$initscript" + "$@" + procd_close_service + } + + start() { + rc_procd start_service "$@" + } + + stop() { + procd_kill "$(basename "$initscript")" "$1" + } + + reload() { + start + } +} + ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}" list_contains ALL_COMMANDS "$action" || action=help [ "$action" = "reload" ] && action='eval reload "$@" || restart "$@" && :' -- cgit v1.2.3 From a9e848f1b73ec05528ca7c01603a80ff87faad97 Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 15 Jan 2013 13:07:51 +0000 Subject: base-files: add support for ipv6-prefixes in connection with netifd git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35168 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/sysctl.conf | 2 ++ package/base-files/files/etc/uci-defaults/generate-ula | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/base-files/files/etc/uci-defaults/generate-ula (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index ef3db4ec5..4ea01bb4c 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -12,6 +12,8 @@ net.ipv4.tcp_timestamps=1 net.ipv4.tcp_sack=1 net.ipv4.tcp_dsack=1 +net.ipv6.conf.all.forwarding=1 + net.netfilter.nf_conntrack_acct=1 net.netfilter.nf_conntrack_checksum=0 net.netfilter.nf_conntrack_max=16384 diff --git a/package/base-files/files/etc/uci-defaults/generate-ula b/package/base-files/files/etc/uci-defaults/generate-ula new file mode 100644 index 000000000..f3e493145 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/generate-ula @@ -0,0 +1,18 @@ +#!/bin/sh + +[ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 +# Sometimes results are empty, therefore try until it works... +local r1 r2 r3 +while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do + r1=$(printf "%02x" $(($(/dev/null + set network.globals.ula_prefix=fd$r1:$r2:$r3::/48 + commit network +EOF + +exit 0 + -- cgit v1.2.3 From 7df46a033cb847877010edf267effc4cd05c8e2d Mon Sep 17 00:00:00 2001 From: cyrus Date: Thu, 17 Jan 2013 16:16:02 +0000 Subject: base-files: rename ULA generation script git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35204 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/uci-defaults/generate-ula | 18 ------------------ .../files/etc/uci-defaults/network-generate-ula | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 package/base-files/files/etc/uci-defaults/generate-ula create mode 100644 package/base-files/files/etc/uci-defaults/network-generate-ula (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/uci-defaults/generate-ula b/package/base-files/files/etc/uci-defaults/generate-ula deleted file mode 100644 index f3e493145..000000000 --- a/package/base-files/files/etc/uci-defaults/generate-ula +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -[ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 -# Sometimes results are empty, therefore try until it works... -local r1 r2 r3 -while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do - r1=$(printf "%02x" $(($(/dev/null - set network.globals.ula_prefix=fd$r1:$r2:$r3::/48 - commit network -EOF - -exit 0 - diff --git a/package/base-files/files/etc/uci-defaults/network-generate-ula b/package/base-files/files/etc/uci-defaults/network-generate-ula new file mode 100644 index 000000000..f3e493145 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/network-generate-ula @@ -0,0 +1,18 @@ +#!/bin/sh + +[ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 +# Sometimes results are empty, therefore try until it works... +local r1 r2 r3 +while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do + r1=$(printf "%02x" $(($(/dev/null + set network.globals.ula_prefix=fd$r1:$r2:$r3::/48 + commit network +EOF + +exit 0 + -- cgit v1.2.3 From 5dade080429f461b8f02a8effb835cd309c1d50b Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 18 Jan 2013 12:46:43 +0000 Subject: base-files: use numerically prefixed uci-defaults names git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35218 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/etc/uci-defaults/10_migrate-shadow | 12 ++++++++++++ .../files/etc/uci-defaults/11_migrate-sysctl | 17 +++++++++++++++++ .../files/etc/uci-defaults/12_network-generate-ula | 18 ++++++++++++++++++ .../base-files/files/etc/uci-defaults/migrate-shadow | 12 ------------ .../base-files/files/etc/uci-defaults/migrate-sysctl | 17 ----------------- .../files/etc/uci-defaults/network-generate-ula | 18 ------------------ 6 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 package/base-files/files/etc/uci-defaults/10_migrate-shadow create mode 100644 package/base-files/files/etc/uci-defaults/11_migrate-sysctl create mode 100644 package/base-files/files/etc/uci-defaults/12_network-generate-ula delete mode 100644 package/base-files/files/etc/uci-defaults/migrate-shadow delete mode 100644 package/base-files/files/etc/uci-defaults/migrate-sysctl delete mode 100644 package/base-files/files/etc/uci-defaults/network-generate-ula (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/uci-defaults/10_migrate-shadow b/package/base-files/files/etc/uci-defaults/10_migrate-shadow new file mode 100644 index 000000000..b7ea5718c --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/10_migrate-shadow @@ -0,0 +1,12 @@ +#!/bin/sh + +local ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)" +local spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)" + +if [ -n "${ppwd#[\!x]}" ] && [ -z "${spwd#[\!x]}" ]; then + logger -t migrate-shadow "Moving root password hash into shadow database" + sed -i -e "s:^root\:[^\:]*\::root\:x\::" /etc/passwd + sed -i -e "s:^root\:[^\:]*\::root\:$ppwd\::" /etc/shadow +fi + +exit 0 diff --git a/package/base-files/files/etc/uci-defaults/11_migrate-sysctl b/package/base-files/files/etc/uci-defaults/11_migrate-sysctl new file mode 100644 index 000000000..b3796a4d2 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/11_migrate-sysctl @@ -0,0 +1,17 @@ +#!/bin/sh + +if [ ! -f "/rom/etc/sysctl.conf" ] || cmp -s "/rom/etc/sysctl.conf" "/etc/sysctl.conf"; then + exit 0 +fi + +fingerprint="$(md5sum /etc/sysctl.conf)" +fingerprint="${fingerprint%% *}" + +if [ "$fingerprint" = "1b05ebb41f72cb84e5510573cd4aca26" ] || \ + [ "$fingerprint" = "62deb895be1a7f496040187b7c930e4e" ]; then + logger -t migrate-sysctl "Updating sysctl.conf to use current defaults" + cp "/rom/etc/sysctl.conf" "/etc/sysctl.conf" +fi + +exit 0 + diff --git a/package/base-files/files/etc/uci-defaults/12_network-generate-ula b/package/base-files/files/etc/uci-defaults/12_network-generate-ula new file mode 100644 index 000000000..f3e493145 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/12_network-generate-ula @@ -0,0 +1,18 @@ +#!/bin/sh + +[ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 +# Sometimes results are empty, therefore try until it works... +local r1 r2 r3 +while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do + r1=$(printf "%02x" $(($(/dev/null + set network.globals.ula_prefix=fd$r1:$r2:$r3::/48 + commit network +EOF + +exit 0 + diff --git a/package/base-files/files/etc/uci-defaults/migrate-shadow b/package/base-files/files/etc/uci-defaults/migrate-shadow deleted file mode 100644 index b7ea5718c..000000000 --- a/package/base-files/files/etc/uci-defaults/migrate-shadow +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -local ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)" -local spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)" - -if [ -n "${ppwd#[\!x]}" ] && [ -z "${spwd#[\!x]}" ]; then - logger -t migrate-shadow "Moving root password hash into shadow database" - sed -i -e "s:^root\:[^\:]*\::root\:x\::" /etc/passwd - sed -i -e "s:^root\:[^\:]*\::root\:$ppwd\::" /etc/shadow -fi - -exit 0 diff --git a/package/base-files/files/etc/uci-defaults/migrate-sysctl b/package/base-files/files/etc/uci-defaults/migrate-sysctl deleted file mode 100644 index b3796a4d2..000000000 --- a/package/base-files/files/etc/uci-defaults/migrate-sysctl +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ ! -f "/rom/etc/sysctl.conf" ] || cmp -s "/rom/etc/sysctl.conf" "/etc/sysctl.conf"; then - exit 0 -fi - -fingerprint="$(md5sum /etc/sysctl.conf)" -fingerprint="${fingerprint%% *}" - -if [ "$fingerprint" = "1b05ebb41f72cb84e5510573cd4aca26" ] || \ - [ "$fingerprint" = "62deb895be1a7f496040187b7c930e4e" ]; then - logger -t migrate-sysctl "Updating sysctl.conf to use current defaults" - cp "/rom/etc/sysctl.conf" "/etc/sysctl.conf" -fi - -exit 0 - diff --git a/package/base-files/files/etc/uci-defaults/network-generate-ula b/package/base-files/files/etc/uci-defaults/network-generate-ula deleted file mode 100644 index f3e493145..000000000 --- a/package/base-files/files/etc/uci-defaults/network-generate-ula +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -[ "$(uci get network.globals.ula_prefix)" != "auto" ] && exit 0 -# Sometimes results are empty, therefore try until it works... -local r1 r2 r3 -while [ -z "$r1" -o -z "$r2" -o -z "$r3" ]; do - r1=$(printf "%02x" $(($(/dev/null - set network.globals.ula_prefix=fd$r1:$r2:$r3::/48 - commit network -EOF - -exit 0 - -- cgit v1.2.3 From c1b55275718167eff157f49d549050952637d664 Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 22 Jan 2013 16:47:09 +0000 Subject: base-files: Set default value for IPv6 forwarding git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35299 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/sysctl.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index 4ea01bb4c..52aea5501 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -13,6 +13,7 @@ net.ipv4.tcp_sack=1 net.ipv4.tcp_dsack=1 net.ipv6.conf.all.forwarding=1 +net.ipv6.conf.default.forwarding=1 net.netfilter.nf_conntrack_acct=1 net.netfilter.nf_conntrack_checksum=0 -- cgit v1.2.3 From a19e709ca77b68292ce8da958e64df9eab656caa Mon Sep 17 00:00:00 2001 From: cyrus Date: Mon, 28 Jan 2013 13:53:38 +0000 Subject: base-files: remove IPv6-forwarding setting for all interfaces git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35344 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/sysctl.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index 52aea5501..1841dd4ca 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -12,7 +12,6 @@ net.ipv4.tcp_timestamps=1 net.ipv4.tcp_sack=1 net.ipv4.tcp_dsack=1 -net.ipv6.conf.all.forwarding=1 net.ipv6.conf.default.forwarding=1 net.netfilter.nf_conntrack_acct=1 -- cgit v1.2.3 From 8ddd158504f4a05bfe91645b347681ad56c8d471 Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 29 Jan 2013 10:13:33 +0000 Subject: base-files: Fix race-conditions with IPv6 sysctls git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35368 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 3 +++ package/base-files/files/etc/sysctl.conf | 3 ++- package/base-files/files/etc/sysctl_early.conf | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 package/base-files/files/etc/sysctl_early.conf (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index ef97383d8..180034236 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -95,6 +95,9 @@ start() { rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline) [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root } + + # run early sysctl + [ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&- } stop() { diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index 1841dd4ca..890e77af8 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -12,7 +12,8 @@ net.ipv4.tcp_timestamps=1 net.ipv4.tcp_sack=1 net.ipv4.tcp_dsack=1 -net.ipv6.conf.default.forwarding=1 +net.ipv6.conf.default.forwarding=2 +net.ipv6.conf.all.forwarding=2 net.netfilter.nf_conntrack_acct=1 net.netfilter.nf_conntrack_checksum=0 diff --git a/package/base-files/files/etc/sysctl_early.conf b/package/base-files/files/etc/sysctl_early.conf new file mode 100644 index 000000000..6f2eeea04 --- /dev/null +++ b/package/base-files/files/etc/sysctl_early.conf @@ -0,0 +1,3 @@ +# Avoid race-conditions with SLAAC +net.ipv6.conf.default.accept_ra=0 +net.ipv6.conf.all.accept_ra=0 -- cgit v1.2.3 From 8a0e57cc7c94f77a98f973b06e04bdfc8fb5adf6 Mon Sep 17 00:00:00 2001 From: cyrus Date: Fri, 1 Feb 2013 12:28:24 +0000 Subject: base-files: Fix IPv6 early sysctls again * Kernel IPv6 /proc interface inconsistency caused races git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35417 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 8 ++++++-- package/base-files/files/etc/sysctl_early.conf | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 package/base-files/files/etc/sysctl_early.conf (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 180034236..005c4ad6f 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -96,8 +96,12 @@ start() { [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root } - # run early sysctl - [ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&- + # early sysctl to avoid networking races + if [ -d /proc/sys/net/ipv6/conf ]; then + for i in /proc/sys/net/ipv6/conf/*/accept_ra; do + echo 0 > $i + done + fi } stop() { diff --git a/package/base-files/files/etc/sysctl_early.conf b/package/base-files/files/etc/sysctl_early.conf deleted file mode 100644 index 6f2eeea04..000000000 --- a/package/base-files/files/etc/sysctl_early.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Avoid race-conditions with SLAAC -net.ipv6.conf.default.accept_ra=0 -net.ipv6.conf.all.accept_ra=0 -- cgit v1.2.3 From 35dde6748e98a2a7725e220c5ea8f63c7d9c185c Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 13 Mar 2013 18:11:19 +0000 Subject: [base-files] make basefiles aware of procd Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36003 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/hotplug2-common.rules | 43 ---------------------- package/base-files/files/etc/hotplug2-init.rules | 5 --- package/base-files/files/etc/init.d/boot | 32 ---------------- package/base-files/files/etc/init.d/rcS | 25 ++----------- package/base-files/files/etc/init.d/watchdog | 13 ------- package/base-files/files/etc/inittab | 3 +- package/base-files/files/etc/preinit | 2 + package/base-files/files/etc/rc.button/failsafe | 2 + package/base-files/files/etc/rc.button/reset | 18 +++++++++ package/base-files/files/etc/rc.button/rfkill | 23 ++++++++++++ 10 files changed, 50 insertions(+), 116 deletions(-) delete mode 100644 package/base-files/files/etc/hotplug2-common.rules delete mode 100644 package/base-files/files/etc/hotplug2-init.rules delete mode 100755 package/base-files/files/etc/init.d/watchdog create mode 100755 package/base-files/files/etc/rc.button/failsafe create mode 100755 package/base-files/files/etc/rc.button/reset create mode 100755 package/base-files/files/etc/rc.button/rfkill (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules deleted file mode 100644 index c284f8f3f..000000000 --- a/package/base-files/files/etc/hotplug2-common.rules +++ /dev/null @@ -1,43 +0,0 @@ - -# uncomment me to log hotplug events -# DEVPATH is set { -# exec logger -s -t hotplug -p daemon.info "name=%DEVNAME%, path=%DEVPATH%" -# } - -$include /etc/hotplug2-platform.rules - -DEVNAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) { - makedev /dev/%DEVNAME% 0666 - next-event -} - -DEVNAME == mapper/control { - makedev /dev/%DEVNAME% 0600 - next-event -} - -ACTION == add, DEVPATH is set { - makedev /dev/%DEVNAME% 0644 -} - -ACTION == add, DEVPATH is set, DEVNAME ~~ ^tty { - chmod 0666 /dev/%DEVNAME% -} - -ACTION == add, DEVPATH is set, DEVNAME ~~ ^ppp { - chmod 0600 /dev/%DEVNAME% -} - -ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set { - remove /dev/%DEVNAME% -} - -FIRMWARE is set, ACTION == add { - exec /sbin/hotplug-call firmware - load-firmware /lib/firmware - next-event -} - -SUBSYSTEM == platform { - exec /sbin/hotplug-call %SUBSYSTEM% -} diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules deleted file mode 100644 index f01169776..000000000 --- a/package/base-files/files/etc/hotplug2-init.rules +++ /dev/null @@ -1,5 +0,0 @@ -$include /etc/hotplug2-common.rules - -SUBSYSTEM == button { - exec kill -USR1 1 -} diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 005c4ad6f..67db0d2a6 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -24,27 +24,6 @@ system_config() { # apply timezone to kernel date -k - - if [ -x /sbin/syslogd ]; then - local args log_ip log_size log_port log_type log_file - config_get log_ip "$cfg" log_ip - config_get log_size "$cfg" log_size 16 - config_get log_port "$cfg" log_port 514 - config_get log_type "$cfg" log_type circular - config_get log_file "$cfg" log_file "/var/log/messages" - args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}" - if [ "$log_type" = "file" ]; then - args="$args -s $log_size -O $log_file -S" - else - args="$args -C${log_size}" - fi - service_start /sbin/syslogd $args - fi - if [ -x /sbin/klogd ]; then - config_get klogconloglevel "$cfg" klogconloglevel - args="${klogconloglevel:+-c $klogconloglevel}" - service_start /sbin/klogd $args - fi } apply_uci_config() { @@ -84,12 +63,6 @@ start() { config_load system config_foreach system_config system - killall -q hotplug2 - [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \ - --set-rules-file /etc/hotplug2.rules \ - --set-coldplug-cmd /sbin/udevtrigger \ - --max-children 1 >/dev/null 2>&1 & - # create /dev/root if it doesn't exist [ -e /dev/root -o -h /dev/root ] || { rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline) @@ -103,8 +76,3 @@ start() { done fi } - -stop() { - service_stop /sbin/klogd - service_stop /sbin/syslogd -} diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS index 3ec9bfef6..9599bbf32 100755 --- a/package/base-files/files/etc/init.d/rcS +++ b/package/base-files/files/etc/init.d/rcS @@ -1,26 +1,9 @@ #!/bin/sh # Copyright (C) 2006 OpenWrt.org -run_scripts() { - for i in /etc/rc.d/$1*; do - [ -x $i ] && $i $2 2>&1 - done | $LOGGER -} - -system_config() { - config_get_bool foreground $1 foreground 0 -} - LOGGER="cat" -[ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit" - -. /lib/functions.sh - -config_load system -config_foreach system_config system +[ -x /usr/bin/logger ] && LOGGER="logger -p 6 -t sysinit" -if [ "$1" = "S" -a "$foreground" != "1" ]; then - run_scripts "$1" "$2" & -else - run_scripts "$1" "$2" -fi +for i in /etc/rc.d/$1*; do + [ -x $i ] && $i $2 2>&1 +done | $LOGGER diff --git a/package/base-files/files/etc/init.d/watchdog b/package/base-files/files/etc/init.d/watchdog deleted file mode 100755 index 299c89142..000000000 --- a/package/base-files/files/etc/init.d/watchdog +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2008-2011 OpenWrt.org - -START=97 - -start() { - [ -c /dev/watchdog ] || return 1 - [ -x /sbin/watchdog ] || return 1 - service_start /sbin/watchdog -t 5 /dev/watchdog -} -stop() { - service_stop /sbin/watchdog -} diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab index ca90fd8a2..781718593 100644 --- a/package/base-files/files/etc/inittab +++ b/package/base-files/files/etc/inittab @@ -1,4 +1,3 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown -ttyS0::askfirst:/bin/ash --login -tty1::askfirst:/bin/ash --login +::askconsole:/bin/ash --login diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index b237c2e06..ff26f96d6 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -2,6 +2,8 @@ # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications +[ -z "$PREINIT" ] && exec /sbin/init + export PATH=/bin:/sbin:/usr/bin:/usr/sbin pi_ifname= diff --git a/package/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe new file mode 100755 index 000000000..dcdf7de80 --- /dev/null +++ b/package/base-files/files/etc/rc.button/failsafe @@ -0,0 +1,2 @@ +#!/bin/sh +touch /tmp/failsafe_button diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset new file mode 100755 index 000000000..763994d07 --- /dev/null +++ b/package/base-files/files/etc/rc.button/reset @@ -0,0 +1,18 @@ +#!/bin/sh + +[ "${ACTION}" = "released" ] || exit 0 + +. /lib/functions.sh + +logger "$BUTTON pressed for $SEEN seconds" + +if [ "$SEEN" -lt 1 ] +then + echo "REBOOT" > /dev/console + sync + reboot +elif [ "$SEEN" -gt 5 ] +then + echo "FACTORY RESET" > /dev/console + firstboot && reboot & +fi diff --git a/package/base-files/files/etc/rc.button/rfkill b/package/base-files/files/etc/rc.button/rfkill new file mode 100755 index 000000000..7a8cfe91b --- /dev/null +++ b/package/base-files/files/etc/rc.button/rfkill @@ -0,0 +1,23 @@ +#!/bin/sh + +[ "${ACTION}" = "released" ] || exit 0 + +. /lib/functions.sh + +local rfkill_state=0 + +wifi_rfkill_set() { + uci set wireless.$1.disabled=$rfkill_state +} + +wifi_rfkill_check() { + local disabled + config_get disabled $1 disabled + [ "$disabled" = "1" ] || rfkill_state=1 +} + +config_load wireless +config_foreach wifi_rfkill_check wifi-device +config_foreach wifi_rfkill_set wifi-device +uci commit wireless +wifi up -- cgit v1.2.3 From 30c3e72a1e4893019786eff1d4cd9dfa9dad72e5 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 25 Mar 2013 18:43:30 +0000 Subject: package/base-files: change sysctl handling Move /etc/init.d/sysctl to index 00 and add hotplug script that applies interface specific sysctls for interfaces that only appear later - this allows to reliably configure per-interface parameters in sysctl.conf, e.g. to disable ipv6 autoconfig on a specific iface. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36129 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/hotplug.d/net/00-sysctl | 6 ++++++ package/base-files/files/etc/init.d/sysctl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 package/base-files/files/etc/hotplug.d/net/00-sysctl (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/hotplug.d/net/00-sysctl b/package/base-files/files/etc/hotplug.d/net/00-sysctl new file mode 100644 index 000000000..5d9da8ac0 --- /dev/null +++ b/package/base-files/files/etc/hotplug.d/net/00-sysctl @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -f /etc/sysctl.conf ] && [ "$ACTION" = add ]; then + sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" /etc/sysctl.conf | \ + sysctl -e -p - | logger -t sysctl +fi diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index 239779055..beeb79f7e 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=99 +START=0 start() { [ -f /etc/sysctl.conf ] && sysctl -p -e >&- } -- cgit v1.2.3 From d208aa2b0bbd43ffab2d54960c8b695632f9948f Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 25 Mar 2013 18:45:23 +0000 Subject: base-files: fix bad start index in previous commit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36130 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/sysctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index beeb79f7e..81b0c9ba1 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=0 +START=00 start() { [ -f /etc/sysctl.conf ] && sysctl -p -e >&- } -- cgit v1.2.3 From 0b02cb7ac6a0503d174b64f16fc08f152124f7f9 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 26 Mar 2013 10:02:58 +0000 Subject: base-files: move sysctl init after boot git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36131 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/sysctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index 81b0c9ba1..3480d6641 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=00 +START=11 start() { [ -f /etc/sysctl.conf ] && sysctl -p -e >&- } -- cgit v1.2.3 From 7b026cdf8a8da5c160105cae06813c956766b65c Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 9 Apr 2013 08:03:08 +0000 Subject: Adapt default network configuration for IPv6 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36278 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/config/network | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index a35fd2ef9..f2afcd970 100644 --- a/package/base-files/files/etc/config/network +++ b/package/base-files/files/etc/config/network @@ -12,3 +12,11 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 + option ip6assign 64 + +config interface wan6 + option ifname @wan + option proto dhcpv6 + +config globals globals + option ula_prefix auto -- cgit v1.2.3 From c37a21d752af2af20e31fde9235c85161a8c5e8a Mon Sep 17 00:00:00 2001 From: cyrus Date: Mon, 22 Apr 2013 19:40:16 +0000 Subject: Change default IPv6 config to enable DHCPv6-PD git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36384 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/config/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index f2afcd970..87b124aa3 100644 --- a/package/base-files/files/etc/config/network +++ b/package/base-files/files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan -- cgit v1.2.3 From 533fc89abaf81ccf6965f1d1c917421238a83817 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:02:28 +0000 Subject: boot: make use of kmodloader if it is available Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36428 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 67db0d2a6..4f35eac7b 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -48,7 +48,11 @@ start() { grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe - load_modules /etc/modules.d/* + if [ -f /sbin/kmodloader ]; then + /sbin/kmodloader + else + load_modules /etc/modules.d/* + fi # allow wifi modules time to settle sleep 1 -- cgit v1.2.3 From b5367474cba180d7b2555e4e30421a7340f63264 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 25 Apr 2013 19:02:32 +0000 Subject: mount_root: prepare base-files Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36429 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/done | 2 +- package/base-files/files/etc/rc.button/reset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done index 827866912..8040766dc 100755 --- a/package/base-files/files/etc/init.d/done +++ b/package/base-files/files/etc/init.d/done @@ -5,7 +5,7 @@ START=95 boot() { [ -d /tmp/root ] && { lock /tmp/.switch2jffs - firstboot switch2jffs + switch2jffs lock -u /tmp/.switch2jffs } diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset index 763994d07..229b503a6 100755 --- a/package/base-files/files/etc/rc.button/reset +++ b/package/base-files/files/etc/rc.button/reset @@ -14,5 +14,5 @@ then elif [ "$SEEN" -gt 5 ] then echo "FACTORY RESET" > /dev/console - firstboot && reboot & + jffs2reset -y && reboot & fi -- cgit v1.2.3