Commit graph

24 commits

Author SHA1 Message Date
juhosg
1fb9ec6d85 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
juhosg
cc3f4bb9ff 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
juhosg
7eb5ccb976 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
blogic
bb153c196b 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
blogic
ed2892bdaa 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
juhosg
7a5d156dbc 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
juhosg
ce72a70117 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
juhosg
0139b32c82 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
cyrus
593cc2f133 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
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
juhosg
ab15bfa483 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
feb7e4aff9 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
877ab89dab 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
jow
52deeb5d9c [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
nbd
06c4117a5a 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
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
a01dc23d17 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
nico
83e18cc961 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
nico
6338cb5b06 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
nico
dbfb368804 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
nico
a12802298d 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
nico
1454b29603 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
nico
a94c88d3c5 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