Commit Graph

225 Commits

Author SHA1 Message Date
Jo-Philipp Wich
616aae91c8 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
John Crispin
755a5b2ee5 procd: make the preinit rules wildcard all buttons for failsafe
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36896 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-10 08:24:44 +00:00
John Crispin
204d07bcd2 base-files: fix failsafe via button press
entering failsafe by pressing a button during boot was broken for procd as init

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36891 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-10 08:24:13 +00:00
Jo-Philipp Wich
53b612f049 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
John Crispin
15816c9cce sysupgrade: fixes broken pipe error during sysupgade
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36548 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-05-05 12:41:42 +00:00
John Crispin
9801819da6 preinit: move cmdline failsafe= handling ot the generic code
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36430 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-25 19:02:37 +00:00
John Crispin
1940283948 mount_root: prepare base-files
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36429 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-25 19:02:32 +00:00
Steven Barth
276de79fca 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
Steven Barth
4c9003ffc7 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
Florian Fainelli
9cba62ed1a base-files: sysupgrade fail with eglibc
With eglibc, "ldd busybox" give us
    libcrypt.so.1 => /lib/libcrypt.so.1 (0x774be000)
    libm.so.6 => /lib/libm.so.6 (0x773e4000)
    libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x773c0000)
    libc.so.6 => /lib/libc.so.6 (0x77276000)
    /lib/ld.so.1 (0x774fe000)

Thus /lib/ld.so.1 is not printed by the libs fonction and isn't copied to the 'new' root before pivot root
libs() { ldd $* | awk '{print $3}'; }
https://dev.openwrt.org/browser/trunk/package/base-files/files/lib/upgrade/common.sh

With uclibc the last line of "ldd busybox" is
    ld-uClibc.so.0 => /lib/ld-uClibc.so.0 (0x77ada000)

Don't know for musl!

This patch replace https://dev.openwrt.org/changeset/19167, as glibc is gone
The other way around is to rework libs()

Please apply the fix (mine or another) on trunk and AA
Might fix https://dev.openwrt.org/ticket/12273

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36107 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-22 10:06:06 +00:00
John Crispin
13b11cb907 [base-files] sysupgrade was broken as procd was getting killed
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36031 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-14 18:43:58 +00:00
John Crispin
47d1577ffb [base-files] make basefiles aware of procd
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36003 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-13 18:11:19 +00:00
Gabor Juhos
9b24e8bb6d 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
Gabor Juhos
f3a456e5f1 base-files: minor cosmetic corrections for functions.sh
- update copyright header
  - remove superfluous shebang left-over from changeset 34794
  - unify function declaration

[juhosg: keep Vertical Communications' copyright notice]

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@35646 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-17 21:47:03 +00:00
Gabor Juhos
9dd345481e base-files: add macaddr_{add,2bin,setbit_la} helpers
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35614 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-16 11:50:22 +00:00
Gabor Juhos
34fe9af047 base-files: add mtd_get_mac_{ascii,binary} helpers
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35612 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-16 11:50:19 +00:00
Steven Barth
18b0769704 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
Jo-Philipp Wich
fa2240a9bb 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
Jo-Philipp Wich
4f988432cb 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
Steven Barth
b04bf87a8d 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
Vasilis Tsiligiannis
d16f38ce7a [package] base-files: Don't pass '--set-worker /lib/hotplug2/worker_fork.so' to hotplug2 (#12781)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35095 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-11 13:20:51 +00:00
Steven Barth
625d2318ae base-files: Fix a typo in config_list_foreach
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34893 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-27 14:10:01 +00:00
Mirko Vogt
1a59d79237 [package/base-files] hot-fix nameclash in sysupgrade: rename pivot() to supivot() in sysupgrade
Sysupgrade defines its very own pivot() function.
Prior merging boot.sh and functions.sh sysupgrade just included boot.sh,
now it includes functions.sh which defines pivot() as well, however
slightly different which causes sysupgrade to fail.

This is a hot-fix to unbreak sysupgrade, however those two pivot()
functions should actually get merged.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34815 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-21 12:10:21 +00:00
Mirko Vogt
4f4f7ca182 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 Vogt
fd18877418 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
Jo-Philipp Wich
2e6a28720c 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
Jo-Philipp Wich
8b39aa4636 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
Jo-Philipp Wich
b1c39b2c14 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
Gabor Juhos
a38aced958 base-files: add mtd_find_chardev helper
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34648 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-12 16:49:50 +00:00
Mirko Vogt
02c0c5873b Revert "remove function find_mtd_part() from /lib/functions.sh"
Reverting commit 34641.
Function find_mtd_part() is needed by some scripts deployed
for certain targets but not including boot.sh after all.
Still, all this certainly needs some love.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34642 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-12 13:41:56 +00:00
Mirko Vogt
fcdaf31751 remove function find_mtd_part() from /lib/functions.sh
Since all scripts using this function include /lib/functions/boot.sh -
where this function is defined as well - it can be dropped
from /lib/functions.sh. Also avoids further confusion about this
function being declared and defined in two different places.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34641 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-12-12 12:38:31 +00:00
Florian Fainelli
66fc4eb6d5 [package] base-files: use a natural mount syntax
Busybox built against musl-libc will choke on these otherwise, besides that
it is more natural to use the filesystem type, then options, then name, then
mountpoint.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34308 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-23 20:02:02 +00:00
Jo-Philipp Wich
6f223b33c2 [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
Gabor Juhos
26b0b0cea8 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
Jo-Philipp Wich
1f88d93e7e [package] base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-07-03 15:43:43 +00:00
Jo-Philipp Wich
477607f2e1 [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
Jo-Philipp Wich
1d62b57940 [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
Jo-Philipp Wich
5ee560d56c [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
Jo-Philipp Wich
ec1352fc73 [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
Jo-Philipp Wich
4ea1d476a1 [package] base-files: make user_add() populate the shadow db as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32063 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-05 17:40:32 +00:00
Jo-Philipp Wich
75a299db50 [package] /etc/functions.sh => /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32062 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-05 16:04:23 +00:00
Gabor Juhos
932f2f9811 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
Jo-Philipp Wich
bff890af67 [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
Jo-Philipp Wich
55770be655 [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
Jo-Philipp Wich
c092e2336f [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
Jo-Philipp Wich
1ee066a435 [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
Felix Fietkau
010cd3161d base-files: kill ubusd and udhcpc on sysupgrade as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31852 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:54:12 +00:00
Felix Fietkau
c136759736 base-files: allow sysupgrade to kill netifd, fixes pppd shutdown on upgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31851 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:49:31 +00:00
Gabor Juhos
0e9d604ef7 package/base-files: copy /lib/functions.sh to the ramfs on sysupgrade
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31842 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-23 21:05:20 +00:00
Florian Fainelli
f5d51997d8 [package] base-files: fix typo in 05_firstboot_skip script (#11359)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31492 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-27 16:49:16 +00:00