summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2005-11-05 06:31:33 +0000
committerChristian Heim <phreak@gentoo.org>2005-11-05 06:31:33 +0000
commitc19e259b2b3334adde61c3db89774b9db41b8704 (patch)
treed6aa04fd4bd07e9bb83abae6d63f7cb9c7b82c2f /net-scripts/net.modules.d/essidnet
parentMerging changes from baselayout 1583 (diff)
downloadbaselayout-vserver-c19e259b2b3334adde61c3db89774b9db41b8704.tar.gz
baselayout-vserver-c19e259b2b3334adde61c3db89774b9db41b8704.tar.bz2
baselayout-vserver-c19e259b2b3334adde61c3db89774b9db41b8704.zip
Merging changes between baselayout r1583 and r1596.
svn path=/baselayout-vserver/trunk/; revision=64
Diffstat (limited to 'net-scripts/net.modules.d/essidnet')
-rw-r--r--net-scripts/net.modules.d/essidnet35
1 files changed, 4 insertions, 31 deletions
diff --git a/net-scripts/net.modules.d/essidnet b/net-scripts/net.modules.d/essidnet
index 967776b..32f0f3f 100644
--- a/net-scripts/net.modules.d/essidnet
+++ b/net-scripts/net.modules.d/essidnet
@@ -8,44 +8,17 @@
# Load our config if it exists
[[ -f $(add_suffix "/etc/conf.d/wireless" ) ]] \
-&& source $(add_suffix "/etc/conf.d/wireless" )
+ && source $(add_suffix "/etc/conf.d/wireless" )
# void essidnet_depend(void)
#
# Sets up the dependancies for the module
essidnet_depend() {
- before interface
+ before interface system
after wireless
installed wireless
-}
-
-# bool essidnet_check_installed(void)
-#
-# Always returns 0 as we are "installed" by wireless in the depend function
-essidnet_check_installed() {
- return 0
-}
-
-# char* essidnet_provides(void)
-#
-# Returns a string to change module definition for starting up
-essidnet_provides() {
- echo "essidnet"
-}
-
-# bool essidnet_check_depends(void)
-#
-# Checks to see if we have the needed functions
-essidnet_check_depends() {
- local f
-
- for f in wireless_check_extensions wireless_get_essid wireless_get_ap_mac_address; do
- [[ $( type -t "${f}" ) == "function" ]] && continue
- eerror "essidnet: missing required function ${f}\n"
- return 1
- done
-
- return 0
+ functions wireless_check_extensions wireless_get_essid \
+ wireless_get_ap_mac_address
}
# bool essidnet_start(char *iface)