diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-03-09 10:07:19 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-03-09 10:07:19 +0000 |
| commit | f066e899210534cedced47c0c9076fe7c90a6693 (patch) | |
| tree | 5ce0ac5c40ad8aeb5a67ec336bb78c750b986828 /src | |
| parent | Fixing the indentation of the Changelog entries (diff) | |
| download | baselayout-vserver-f066e899210534cedced47c0c9076fe7c90a6693.tar.gz baselayout-vserver-f066e899210534cedced47c0c9076fe7c90a6693.tar.bz2 baselayout-vserver-f066e899210534cedced47c0c9076fe7c90a6693.zip | |
Merging r1939
svn path=/baselayout-vserver/trunk/; revision=276
Diffstat (limited to 'src')
| -rw-r--r-- | src/awk/cachedepends.awk | 18 | ||||
| -rw-r--r-- | src/awk/gendepends.awk | 12 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/awk/cachedepends.awk b/src/awk/cachedepends.awk index 017e231..46945e9 100644 --- a/src/awk/cachedepends.awk +++ b/src/awk/cachedepends.awk @@ -30,9 +30,13 @@ function print_start() { function print_header1(mtime) { print "#*** " MYFILENAME " ***" >> TMPCACHE print "" >> TMPCACHE - print "myservice=\"" MYFILENAME "\"" >> TMPCACHE - print "myservice=\"${myservice##*/}\"" >> TMPCACHE - print "echo \"RCSCRIPT ${myservice}\"" >> TMPCACHE + print "SVCNAME=\"" MYFILENAME "\"" >> TMPCACHE + print "SVCNAME=\"${SVCNAME##*/}\"" >> TMPCACHE + + # Support deprected myservice variable + print "myservice=\"${SVCNAME}\"" >> TMPCACHE + + print "echo \"RCSCRIPT ${SVCNAME}\"" >> TMPCACHE print "" >> TMPCACHE print "echo \"MTIME " mtime "\"" >> TMPCACHE print "" >> TMPCACHE @@ -42,11 +46,11 @@ function print_header2(mtime) { print "(" >> TMPCACHE print " # Get settings for rc-script ..." >> TMPCACHE 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 " [ \"${SVCNAME%%.*}\" = \"net\" ] && \\" >> TMPCACHE + print " [ \"${SVCNAME##*.}\" != \"${SVCNAME}\" ] && source /etc/conf.d/net" >> TMPCACHE + print "" >> TMPCACHE + print " [ -e \"/etc/conf.d/${SVCNAME}\" ] && source \"/etc/conf.d/${SVCNAME}\"" >> TMPCACHE print "" >> TMPCACHE print " [ -e /etc/rc.conf ] && source /etc/rc.conf" >> TMPCACHE print "" >> TMPCACHE diff --git a/src/awk/gendepends.awk b/src/awk/gendepends.awk index c4073b4..d092ccb 100644 --- a/src/awk/gendepends.awk +++ b/src/awk/gendepends.awk @@ -504,8 +504,8 @@ END { } for (x = TYPES_MIN; x <= TYPES_MAX; x++) - print "rc_type_" TYPE_NAMES[x] "=" x >> (CACHEDTREE) - print "rc_index_scale=" (TYPES_MAX + 1) >> (CACHEDTREE) + print "declare -r rc_type_" TYPE_NAMES[x] "=" x >> (CACHEDTREE) + print "declare -r rc_index_scale=" (TYPES_MAX + 1) >> (CACHEDTREE) print "" >> (CACHEDTREE) print "declare -a RC_DEPEND_TREE" >> (CACHEDTREE) print "" >> (CACHEDTREE) @@ -542,15 +542,17 @@ END { print "" >> (CACHEDTREE) } + # Ensure that no-one changes our tree + print "declare -r RC_DEPEND_TREE" >> (CACHEDTREE) # Do not export these, as we want them local - print "RC_GOT_DEPTREE_INFO=\"yes\"" >> (CACHEDTREE) + print "declare -r RC_GOT_DEPTREE_INFO=\"yes\"" >> (CACHEDTREE) print "" >> (CACHEDTREE) if (check_provide("logger")) - print "LOGGER_SERVICE=\"" get_provide("logger") "\"" >> (CACHEDTREE) + print "declare -r LOGGER_SERVICE=\"" get_provide("logger") "\"" >> (CACHEDTREE) else - print "LOGGER_SERVICE=" >> (CACHEDTREE) + print "declare -r LOGGER_SERVICE=" >> (CACHEDTREE) close(CACHEDTREE) |