Commit Graph

47 Commits (409777485f94f4cdbfdeb3f20e80095d3d31893f)

Author SHA1 Message Date
John Crispin 894af53f00 base-files: default_postinst() - create user:group first (resend)
create user:group before running postinst-pkg. the postinst hook might require
the user:group to already exist.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43472 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-01 16:15:13 +00:00
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 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
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
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
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
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
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 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
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
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
Gabor Juhos e3b2c6418f base-files: mtd_get_mac_ascii bugfix
The mtd_get_mac_ascii utility function was broken. This fixes it.

  - Remove the superfluous include of /lib/functions.sh. The
    function is already in that file so it is pointless,
  - only use a variable if the whole key word matches,
  - don't try to process the MAC address if it is empty,
  - use 'tr' to canonicalize the MAC address,

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
[juhosg: add more fixes, update commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38690 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-08 12:16:21 +00:00
Gabor Juhos c475e599b4 base-files: add mtd_get_part_size helper
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37475 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-20 09:25:49 +00:00
John Crispin 21ee9d504d package: fix insmod on install
the procd changes broke the postinst insmod.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37015 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-22 22:09:40 +00:00
John Crispin 1b9e69e5a8 base-files: module loading is now handled by ubox/kmodloader
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37003 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-21 16:53:59 +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 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 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
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
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
Felix Fietkau d8d2b5d324 base-files: rename internal variables in config_foreach to make namespace conflicts more unlikely
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31431 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-21 20:34:45 +00:00
Felix Fietkau b64a2fe1e9 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
Gabor Juhos b0d43f3f24 base-files: remove trailing whitespaces from lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30775 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-02 11:17:29 +00:00
Nicolas Thill dc5dd36df4 package/base-files: enhance service functions
* allow matching process by name (useful for processes changing it)
 * check if first argument is executable
 * fix function name used in error messages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28991 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-12 13:53:15 +00:00
Nicolas Thill 1b025024d4 package/base-files: /lib/functions.sh: add {group,user}_{add,exists} functions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28871 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-09 00:23:58 +00:00
Nicolas Thill 95910adf11 package/base-files: /lib/functions.sh: let service_stop exit early if no matching process to stop where found
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28870 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 23:35:13 +00:00
Nicolas Thill ff9120ca00 package/base-files: enhance & cleanup service wrappers
* add service_check function for checking if a process is alive
 * add service_signal for sending arbitrary signals to a process
 * change service_stop to send a TERM signal first, wait for the process to die and send a KILL signal if it doen't
 * have service_kill print a warning on STDERR stating it has been deprecated

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28865 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 22:47:49 +00:00
Nicolas Thill b86726c283 package/base-files: move service* functions from /etc/rc.common to /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28864 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 22:47:41 +00:00
Nicolas Thill e7340d0dca package/base-files: move /etc/functions.sh to /lib/functions.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28857 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-08 14:14:29 +00:00