summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2005-09-04 09:37:52 +0000
committerBenedikt Boehm <hollow@gentoo.org>2005-09-04 09:37:52 +0000
commit12bf031f33b7da07315bd16fb8ee7e12ea2e50bb (patch)
tree528da99115ffc9a730181d3276971c40dc82cf97 /src
parentminor fix (diff)
downloadbaselayout-vserver-12bf031f33b7da07315bd16fb8ee7e12ea2e50bb.tar.gz
baselayout-vserver-12bf031f33b7da07315bd16fb8ee7e12ea2e50bb.tar.bz2
baselayout-vserver-12bf031f33b7da07315bd16fb8ee7e12ea2e50bb.zip
minor cleanup
svn path=/baselayout-vserver/trunk/; revision=32
Diffstat (limited to 'src')
-rw-r--r--src/awk/cachedepends.awk4
-rw-r--r--src/awk/gendepends.awk11
2 files changed, 2 insertions, 13 deletions
diff --git a/src/awk/cachedepends.awk b/src/awk/cachedepends.awk
index 017e231..1e508a1 100644
--- a/src/awk/cachedepends.awk
+++ b/src/awk/cachedepends.awk
@@ -44,10 +44,6 @@ 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 c4073b4..5a7f9de 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)) && (deparray[x] != "net")) {
+ if (((type == NEED) || (type == NEEDME))) {
ewarn(" Can't find service '" deparray[x] "' needed by '" service "'; continuing...")
@@ -268,8 +268,7 @@ function resolve_depend(type, service, deplist, x, deparray)
continue
}
- else if (deparray[x] != "net")
- continue
+ continue
}
# Ugly bug ... if a service depends on itself, it creates
@@ -469,12 +468,6 @@ 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)