Commit Graph

282 Commits

Author SHA1 Message Date
John Crispin
9f53cd1006 default_postinst() fix wrong call of group_add
[base-files] default_postinst() fix wrong call of group_add
after 12bae65d07d29854204715cebc1ef1eae237fd9b group_add is
always called. shell scripting can be tricky...

wrong call:
[ -n "$gid" ] && group_exists $name || group_add $name $gid

this leads to a call of 'group_add' when $gid is emtpy, proof:

root@box:~ functionA() { echo A; }
root@box:~ functionB() { echo B; }
root@box:~ VAR=
root@box:~ [ -n "$VAR" ] && functionA || functionB
B
root@box:~ # functionB was called, but VAR is not filled
root@box:~ VAR=filled
root@box:~ [ -n "$VAR" ] && functionA || functionB
A

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42926 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-15 17:55:13 +00:00
John Crispin
19246191d3 base-files: default_postinst() force clear luci-indexcache
Inside every LuCI package you need to clear luci-indexcache and
sometimes when installing non LuCI pacakges it's also needed to clear
it. Easier put it into default_postinst().

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42923 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 19:01:30 +00:00
John Crispin
2897186939 base-files: the USERID code path did not check for duplicate groups
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42919 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-14 19:01:05 +00:00
John Crispin
81d9f2d585 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
Steven Barth
c9ab6f3a67 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
Steven Barth
3823e9634d 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
John Crispin
f9cddd1fd9 base-files: extend USERID:=syntax
it is now possible to inlie the uid and gid in the syntax

USERID:=username=uid:group=gid:group2=gid2:...

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42838 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-08 08:01:28 +00:00
John Crispin
fef66999f8 base-files: make postinst script run inside a subshell
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42800 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-06 05:55:35 +00:00
Florian Fainelli
ccd5dae4f1 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
John Crispin
a0bbe0d6ce postinst trigger: the new postinst trigger broke IB
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42571 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-16 11:56:19 +00:00
Luka Perkov
38c2d876ab 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
John Crispin
3caa9395b5 ipkg: add a default postinst/prerm script
the postinst script enables/starts the init.d scripts upon package installation
and installs the users required by the package.

the prerm script stops and disables the init.d scripts.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42470 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-09-11 12:27:49 +00:00
John Crispin
d5a9dd2b58 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
Jo-Philipp Wich
369b4791ce 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 83e9122f88a002871d5cdf421cf6aa6052b7e006

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
Gabor Juhos
59f759b8a5 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
John Crispin
0126e7505e sysupgrade: Enable killing of all processes under upgraded
If the sysupgrade scripts is called under upgraded, it will not kill all
other processes as it should to avoid interference by locked filesystem.
This patch checks the parent and if it is upgraded, it kills all.

Signed-off-by: André Valentin <avalentin@marcant.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41563 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-10 19:16:27 +00:00
John Crispin
b174e169b7 base-files: fix ramfs / nand upgrade
/lib/{imx6,lantiq,...}.sh are needed in the ramfs for sysupgrade to work.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41440 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-01 10:26:14 +00:00
Luka Perkov
ba967cd842 base-files: define yes/no as valid boolean options
ubox validate_data defines yes/no as valid boolean options, do the same in
config_get_bool too.

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41405 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-29 23:05:05 +00:00
John Crispin
41094c6122 base-files: regenerate the /lib64 symlink when switching to a ramdisk
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41284 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-20 13:41:08 +00:00
Jo-Philipp Wich
1143dd9e2e 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
John Crispin
5b5afc12c3 base-files: add upgraded to the list of daemons not killed
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41268 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-19 14:12:55 +00:00
John Crispin
ee158312eb base-files: properly remove stderr from zcat/bzcat
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41135 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 13:00:25 +00:00
John Crispin
ca673771fb base-files: include more ubi* tools in sysupgrade ramdisk
Also add some more busybox symlinks which are useful for sysupgrade
on UBI-enabled devices.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41125 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:33 +00:00
John Crispin
90d0f5654a base-files: Allow installation of symlinks using RAMFS_COPY_BIN env var.
http://patchwork.openwrt.org/patch/5086/

Signed-off-by: karl.vogel@gmail.com

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40943 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:45:13 +00:00
John Crispin
837c7dfb36 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
Felix Fietkau
b1c01b3e3d 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
Felix Fietkau
991bea678a 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
John Crispin
e11ba4da13 base-files: the ubi tol should be installed when jumping to ram_fs
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40420 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 15:35:20 +00:00
John Crispin
1a579e57fe base-files: make use of new fstools
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40416 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 15:10:15 +00:00
Felix Fietkau
d0973094c9 /lib/functions.sh: remove config_rename()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40412 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:29:51 +00:00
Felix Fietkau
8ce376a524 /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
Felix Fietkau
79be8946a7 /lib/functions.sh: remove jffs2_mark_erase()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40410 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:29:42 +00:00
Felix Fietkau
63ec4c522f base-files: remove config_clear() and list_remove()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40409 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:01:59 +00:00
Felix Fietkau
fa7d088f18 base-files: move uci_apply_defaults() to /etc/init.d/boot
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40408 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 10:01:54 +00:00
Felix Fietkau
ad3793303a /lib/functions.sh: remove hotplug_dev()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40406 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:26 +00:00
Felix Fietkau
6fc0daa25c /lib/functions.sh: remove strtok()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40405 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:23 +00:00
Felix Fietkau
fbddef3dc9 /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
Felix Fietkau
b4ee46fb86 /lib/functions.sh: remove pi_include()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40403 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:15 +00:00
Felix Fietkau
9e3ce3f75f /lib/functions.sh: remove jffs2_ready()
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40402 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:11 +00:00
Felix Fietkau
4a736626c1 /lib/functions.sh: remove support for non-overlayfs overlay fopivot types
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40401 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-07 09:50:07 +00:00
John Crispin
937a78b306 ubi-utils: mini version of mtd-utils that only includes ubi tools
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40367 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-03 14:26:42 +00:00
John Crispin
2b77148377 fstools: add the new fstools package
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39895 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-03-12 19:32:51 +00:00
Luka Perkov
79679bce53 [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
John Crispin
41d0bfcc1f base-files: fix mount-utils incompatibility
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39169 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-12-27 21:15:09 +00:00
Jo-Philipp Wich
8dcb4e5990 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 Perkov
d723a38780 [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
John Crispin
3b4cd0a50e base-files: allow users to delect debug level during boot
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38909 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-25 08:34:55 +00:00
Felix Fietkau
9383e3c3c4 ar71xx: Unifi AP Pro sysupgrade patch
The current implementation of mtd will not append the backup
file created by sysupgrade to the correct partition, as mtd will append
the data to first jffs2 partition it finds. As the kernel is also
stored on a jffs2 partition (which resides before the overlay
partition), the data will be appended to this partition.

To fix this problem, a new option

-s <number>             skip the first n bytes when appending data to the jffs2 partiton, defaults to "0"

is added to mtd.

Signed-off-by: Peter Wagner <tripolar@gmx.at>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38807 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-14 19:38:54 +00:00
Gabor Juhos
3e44099b61 base-files: add macaddr_canonicalize helper function
In commit r38690, the MAC address canonicalization
has been converted to use 'tr' instead of 'printf'.
This only works if with MAC addresses which uses
the 'xx:xx:xx:xx:xx:xx' format.

However on some boards, the MAC addresses are stored
in different format in the mtd partition. Some vendors
are using hyphens or dots as separators instead of
colons. Also the leading zeroes may be missing from the
individual octets or those are replaced with spaces.

Add a new function which can be used to convert these
into the 'xx:xx:xx:xx:xx:xx' format. Also update the
'mtd_get_mac_ascii' function to use the new helper.

The helper function is based on this code:
  http://isquared.nl/blog/2010/08/11/Bash-function-to-canonicalize-MAC-addresses/

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38803 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-14 17:44:42 +00:00
Hauke Mehrtens
f82ba95657 base-files: don't kill nas for sysupgrade
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38766 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-11 22:12:58 +00:00