diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2005-10-09 08:31:20 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2005-10-09 08:31:20 +0000 |
| commit | 53c0ee2f8b484270b6ad60d53c5f7247e9a428db (patch) | |
| tree | 693a49c846b08b89cc2c784dc692dd44904ed2ec /src | |
| parent | Refreshing baselayout-vserver with revision 1560 from baselayout. (diff) | |
| download | baselayout-vserver-53c0ee2f8b484270b6ad60d53c5f7247e9a428db.tar.gz baselayout-vserver-53c0ee2f8b484270b6ad60d53c5f7247e9a428db.tar.bz2 baselayout-vserver-53c0ee2f8b484270b6ad60d53c5f7247e9a428db.zip | |
add back net services
svn path=/baselayout-vserver/trunk/; revision=52
Diffstat (limited to 'src')
| -rw-r--r-- | src/awk/cachedepends.awk | 4 | ||||
| -rw-r--r-- | src/awk/gendepends.awk | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/awk/cachedepends.awk b/src/awk/cachedepends.awk index 1e508a1..017e231 100644 --- a/src/awk/cachedepends.awk +++ b/src/awk/cachedepends.awk @@ -44,6 +44,10 @@ function print_header2(mtime) { print "" >> TMPCACHE print " [ -e \"/etc/conf.d/${myservice}\" ] && source \"/etc/conf.d/${myservice}\"" >> TMPCACHE print "" >> TMPCACHE + print " [ -e /etc/conf.d/net ] && \\" >> TMPCACHE + print " [ \"${myservice%%.*}\" = \"net\" ] && \\" >> TMPCACHE + print " [ \"${myservice##*.}\" != \"${myservice}\" ] && source /etc/conf.d/net" >> TMPCACHE + print "" >> TMPCACHE print " [ -e /etc/rc.conf ] && source /etc/rc.conf" >> TMPCACHE print "" >> TMPCACHE print " depend() {" >> TMPCACHE diff --git a/src/awk/gendepends.awk b/src/awk/gendepends.awk index 5a7f9de..c4073b4 100644 --- a/src/awk/gendepends.awk +++ b/src/awk/gendepends.awk @@ -259,7 +259,7 @@ function resolve_depend(type, service, deplist, x, deparray) # should handle invalid database entries currently. if (!check_service(deparray[x])) { - if (((type == NEED) || (type == NEEDME))) { + if (((type == NEED) || (type == NEEDME)) && (deparray[x] != "net")) { ewarn(" Can't find service '" deparray[x] "' needed by '" service "'; continuing...") @@ -268,7 +268,8 @@ function resolve_depend(type, service, deplist, x, deparray) continue } - continue + else if (deparray[x] != "net") + continue } # Ugly bug ... if a service depends on itself, it creates @@ -468,6 +469,12 @@ BEGIN { } END { + # Add the 'net' service if it do not exist ... + if (!check_service("net")) { + RC_NUMBER++ + DEPTREE[RC_NUMBER,NAME] = "net" + } + # Calculate all the provides ... for (x = 1;x <= RC_NUMBER;x++) { if ((x,PROVIDE) in DEPTREE) |