Commit graph

61 commits

Author SHA1 Message Date
blogic
25b6072ef2 base-files: Use 200ms LED timing as before for the new phase preinit_regular.
This restores normal pre-r43715 200ms blink-period for the System LED we're all accustomed to see while our OpenWrt routers are booting.

Failsafe possibility will now be signalled with a new 100ms blinking, which is easily recognizable from the normal 200ms booting.

So no existing user will be scared by a new 500ms LED pattern, since such a slow pattern could easily be mistaken for something wrong... I was like "ok why my router is collapsing now, is this a bad flash, a kernel panic, or what else" when I've seen it for the first time ;)

Sorry for not having explained myself better in v1 of this patch.

Original:
Preinit, failsafe is possible: 200ms
Preinit, failsafe not possible anymore, booting normally: 200ms
Failsafe entered: 50ms

Now (after preinit_regular has been introduced):
Preinit, failsafe is possible: 200ms
Preinit, failsafe not possible anymore, booting normally: 500ms *here is the "offending" change*
Failsafe entered: 50ms

With my proposed patch:
Preinit, failsafe is possible: 100ms *indicate this condition with a new timing, that prompts the user to press the key if they want to start failsafe*
Preinit, failsafe not possible anymore, booting normally: 200ms *keep this as before*
Failsafe entered: 50ms

Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44056 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-20 06:54:53 +00:00
blogic
12bde5d2c4 base-files: Add ucidef_set_led_timer to uci-defaults.sh
Signed-off-by: Gerald Kerma <dreagle@doukki.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44000 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-17 13:58:14 +00:00
blogic
89821af9ee base-files: Fix switch settings for uci-defaults-new.sh.
The enable and reset settings need to be added even when they're false. This is true at least for 'enable', that seems to default to true otherwise.

Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43887 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-08 20:26:52 +00:00
blogic
1f62add19a add "preinit_regular" diag.sh set_state argument
This new argument is used right after starting regular preinit (which
happens if failsafe wasn't triggered). The main purpose of "preinit"
argument is to indicate that failsafe can be triggered, however we were
missing a way to inform user that we don't wait for a trigger anymore.
With this change it's clear when failsafe mode can be triggered.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43715 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-15 10:37:00 +00:00
blogic
80abda71b1 scripts: fix wrong usage of '==' operator
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42911 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 12:21:11 +00:00
cyrus
68f0766ef4 base-files: add network_get_ipaddrs_all()
Return all IPv4 and IPv6 addresses.

Signed-off-by: Mathias Kresin <openwrt@kresin.me>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42856 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-09 07:16:29 +00:00
cyrus
8df1acf5e8 network: Unbind DHCPv6 from underlying interfaces
This allows IPv6 to set up without IPv4 being up thus
IPv6-only or IPv6+DS-Lite working with the default config.

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42848 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-08 13:08:05 +00:00
florian
292c1c45ab base-files: add a protocol argument to ucidef_set_interface_raw
Add a third argument to ucidef_set_interface_raw, which is specifying
the protocol.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42665 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-25 19:08:56 +00:00
luka
55e17ee8a5 base-files: whitespace fixes
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42542 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-14 23:15:00 +00:00
blogic
0232a88793 base-files: add a hardware detection layer
this allows targets to use the new uci-default helper which will generate
a file called /etc/board.json. a tool called /bin/config_generate can then
be used to generate the default uci settings.

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42185 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-18 13:09:17 +00:00
jow
5899ac4d0d base-files: /lib/functions/network.sh: fix network_get_ipaddr6
When looking for the first ipaddr also consider the current prefix just
like network_get_ipaddrs6 does. If ipv6-address was empty the function
did not return the first ipaddr even if the list was non-empty.

fixes commit 83e9122f88

Signed-off-by: Henning Schild <henning@hennsch.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42139 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-08-11 18:15:18 +00:00
juhosg
5988bbb0a2 base-files: strip quotes from the MAC address in macaddr_canonicalize()
Extracted from http://patchwork.openwrt.org/patch/5716/

Signed-off-by: Forest Crossman <cyrozap@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41639 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-14 10:25:49 +00:00
jow
83e9122f88 base-files: depend on jsonfilter and rewrite network.sh to use it
Switches /lib/functions/network.sh from jshn based json parsing to
jsonfilter expression while keeping the existing api.

Expensive methods like "network_find_wan" are up to 20x faster now.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41281 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-19 16:06:44 +00:00
blogic
93be9493be base-files: remove function service_kill
Function service_kill is deprecated and has no user, so remove it.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40912 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:43:10 +00:00
nbd
98752008a1 base-files: enable force_link for lan by default
This allows services to bind to it at boot time instead of waiting for a
cable to be plugged in

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40773 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-05-16 19:36:22 +00:00
nbd
96b317524e base-files: add back missing function for find_mtd_part to /lib/functions.sh (fixes #15496)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40426 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-08 21:17:49 +00:00
nbd
1efdae5d35 /lib/functions.sh: move rarely used mtd and macaddr related functions to /lib/functions/system.sh
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40411 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:29:47 +00:00
nbd
78f5d480fd /lib/functions.sh: move preinit related functions to /lib/functions/preinit.sh
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40404 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:19 +00:00
luka
c1010873ad [package] base-files: add ucidef_add_switch_port function
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39372 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-23 11:33:41 +00:00
jow
2c5f724cea base-files: add network_get_protocol() to /lib/functions/network.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39099 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-16 16:28:45 +00:00
luka
4c3e665ffa [package] base-files: fix whitespaces
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39006 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-09 11:30:14 +00:00
jow
221af3896a base-files: reject invalid uci keys in network_get_device() and related procedures (#13886)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37345 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-15 13:42:58 +00:00
jow
acbf4bd703 base-files: network.sh: extend network_get_ipaddr6() / network_get_subnet6() to take ipv6-prefix-assignment into account, add further helper functions to fetch all ips of a given interface
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36942 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-17 11:33:36 +00:00
jow
bd4ec4d567 base-files: change network_find_wan() procedure to ignore default gateways in different routing tables
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36553 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-06 09:33:56 +00:00
cyrus
c37a21d752 Change default IPv6 config to enable DHCPv6-PD
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36384 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-22 19:40:16 +00:00
cyrus
7b026cdf8a Adapt default network configuration for IPv6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36278 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-09 08:03:08 +00:00
juhosg
fb1862c487 base-files: introduce commonly used helper functions for setting leds
Currently, most platforms define such helpers in their own diag.sh
implementation with almost identical code. By factoring out the
common ground it's possible to simplify maintainability and
homogenize the haptics over multiple platforms (so far as is
reasonably practicable, in a next step).

[juhosg:
 - fix led_set_attr parameters in led_timer
 - add led_morse and status_led_set_morse helpers
 - add status_led_blink_{preinit,failsafe} helpers]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35648 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-18 09:56:23 +00:00
cyrus
a95f83769f base-files: fix network_get_prefix6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35300 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-22 16:47:16 +00:00
jow
19cb7485b1 base-files: network.sh: fix typo in previous commit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35287 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-21 19:02:38 +00:00
jow
af83088d43 base-files: network.sh: simplify network_get_prefix6()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35286 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-21 18:54:58 +00:00
cyrus
a9e848f1b7 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
2013-01-15 13:07:51 +00:00
mirko
c8e772f18f merge /lib/functions/boot.sh and /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34794 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-19 16:07:53 +00:00
mirko
53edda1e36 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
2012-12-19 16:07:46 +00:00
jow
0cc78c2020 base-files: use json_is_a() in network.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34733 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-17 13:07:42 +00:00
jow
a06be29d4e base-files: rework cache handling in network.sh to keep the entire parsed ifstatus, use jshn namespaces to support using it concurrently with other jshn users
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34725 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-16 20:17:18 +00:00
jow
2e65184cca base-files: various enhancements to network.sh
- support reading inactive gateways and DNS information in
	  network_get_gateway(), network_get_dnsserver() and network_get_dnssearch()
	  by passing "true" as optional last argument
	- internally cache fetched values to speed up subsequent accesses to the same
	  data, introduce network_flush_cache() to clear them
	- add some inline function documentation

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34722 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-16 18:22:02 +00:00
jow
8579664108 [package] base-files: remove route enabled check in lib/functions/network.sh after netifd bump
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33391 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-13 08:47:10 +00:00
juhosg
c7af93aa5a base-files: uci-defaults for rssileds
Adds capability to add uci-defaults defining RSSI LEDs

Signed-off-by: Daniel Golle <dgolle@allnet.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33164 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-08-13 14:01:37 +00:00
jow
97f0df7a84 [package] base-files: implement network_get_dnsserver() and network_get_dnssearch() in /lib/functions/network.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32531 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-29 19:04:11 +00:00
jow
79cdadea60 [package] base-files: only consider enabled default routes when finding the wan iface (#11774)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32525 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-29 11:58:35 +00:00
jow
f6a09e69e9 [package] base-files: implement network_get_gateway(), network_get_gateway6(), network_find_wan() and network_find_wan6() in /lib/functions/network.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32397 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-17 11:50:50 +00:00
jow
ab865f7094 [package] base-files: implement network_defer_device() and network_ready_device() wrappers for upcoming netifd iface deferring support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32106 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-07 14:55:26 +00:00
juhosg
5e8d1213bc base-files: add LED specific functions to /lib/functions/uci-defaults
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31991 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-29 16:39:16 +00:00
jow
523bb87b7e [package] base-files: add network_is_up()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31978 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-29 02:03:25 +00:00
jow
29377555bf [package] base-files: let network_get_device() return the l3 interface, introduce network_get_physdev() to obtain the underlying iface (if applicable)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31960 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-29 00:20:16 +00:00
jow
7de192f60d [package] base-files: add network_get_device() to network.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31937 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-28 03:24:56 +00:00
jow
41d413b29c [package] base-files: introduce /lib/functions/network.sh
This file will contain common procedures to deal with network interfaces.
Initially provides network_get_ipaddr(), network_get_ipaddr6(),
network_get_subnet() and network_get_subnet6() to determine the
primary IP addresses or subnets of a given logical interface.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31935 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-28 03:15:02 +00:00
nbd
ecce585694 base-files: split service related functions off to /lib/functions/service.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31042 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-20 14:29:50 +00:00
juhosg
93c039a0f3 base-files: remove trailing whitespaces from lib/functions/boot.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30776 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-02 11:17:30 +00:00
juhosg
7b8ee72a99 base-files: add lib/functions/uci-defaults.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29384 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-12-01 22:48:46 +00:00