diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-04-08 09:31:48 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-04-08 09:31:48 +0000 |
| commit | 74d912fddd6b436494504016ff863a2254fd84e4 (patch) | |
| tree | 5ea41084b6d7c36f6951f7a54d03de5b15b3b653 /sys-apps | |
| parent | Added ~ppc. bug 129071 (diff) | |
| download | historical-74d912fddd6b436494504016ff863a2254fd84e4.tar.gz historical-74d912fddd6b436494504016ff863a2254fd84e4.tar.bz2 historical-74d912fddd6b436494504016ff863a2254fd84e4.zip | |
Put the full patch in Roy, lol.
Package-Manager: portage-2.1_pre7-r4
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.11.14-uniqify.patch | 56 |
2 files changed, 59 insertions, 3 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 8951a6db5d91..ce902695ff96 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -37,9 +37,9 @@ SHA256 3bdaae5c1ce59856f77b57e8312a369b61fe1f3cbb17993454a699ea7703e0a6 files/ba MD5 6a8967d43dfa400cdfbab80fc49a7e85 files/baselayout-1.11.14-udhcpc.patch 1301 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f files/baselayout-1.11.14-udhcpc.patch 1301 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc files/baselayout-1.11.14-udhcpc.patch 1301 -MD5 321a6a9c29a81532b6a890f2d29c6481 files/baselayout-1.11.14-uniqify.patch 517 -RMD160 c6dd300480e890371220b92ac8854e36c520d062 files/baselayout-1.11.14-uniqify.patch 517 -SHA256 1c15cfb8d4bb366bc6886f8231288a5b11dfe4b69ddbe55107c0420e48caa2f5 files/baselayout-1.11.14-uniqify.patch 517 +MD5 08385e878922e351d020a26fed4de4de files/baselayout-1.11.14-uniqify.patch 2080 +RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 files/baselayout-1.11.14-uniqify.patch 2080 +SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 files/baselayout-1.11.14-uniqify.patch 2080 MD5 ad54dfecf1af6424be9130191942ea61 files/baselayout-1.12.0_pre16-depscan.patch 4240 RMD160 30944e22e039cba13a56fe59b96378473ddd7a52 files/baselayout-1.12.0_pre16-depscan.patch 4240 SHA256 2e8b48e891a0ebd487f0c2ff70203ecca02521a0b9e584a4c5146dc3a3cba3b6 files/baselayout-1.12.0_pre16-depscan.patch 4240 diff --git a/sys-apps/baselayout/files/baselayout-1.11.14-uniqify.patch b/sys-apps/baselayout/files/baselayout-1.11.14-uniqify.patch index be17742fbf0b..371a090b4f79 100644 --- a/sys-apps/baselayout/files/baselayout-1.11.14-uniqify.patch +++ b/sys-apps/baselayout/files/baselayout-1.11.14-uniqify.patch @@ -1,3 +1,5 @@ +Index: sbin/functions.sh +=================================================================== --- sbin/functions.sh (revision 1964) +++ sbin/functions.sh (working copy) @@ -757,6 +757,18 @@ @@ -19,3 +21,57 @@ ############################################################################## # # +Index: sbin/runscript.sh +=================================================================== +--- sbin/runscript.sh (revision 1964) ++++ sbin/runscript.sh (working copy) +@@ -130,7 +130,7 @@ + ewarn "WARNING: you are stopping a boot service." + fi + +- if [[ ${svcpause} != "yes" ]] ; then ++ if [[ ${svcpause} != "yes" && ${RC_NODEPS} != "yes" ]] ; then + if [[ ${NETSERVICE} == "yes" ]] ; then + # A net.* service + if in_runlevel "${myservice}" "${BOOTLEVEL}" || \ +@@ -238,13 +238,15 @@ + mark_service_started "${myservice}" + + # On rc change, start all services "before $myservice" first +- if is_runlevel_start ; then +- startupservices="$(ineed "${myservice}") \ +- $(valid_iuse "${myservice}") \ +- $(valid_iafter "${myservice}")" +- else +- startupservices="$(ineed "${myservice}") \ +- $(valid_iuse "${myservice}")" ++ if [[ ${RC_NODEPS} != "yes" ]] ; then ++ if is_runlevel_start ; then ++ startupservices="$(ineed "${myservice}") \ ++ $(valid_iuse "${myservice}") \ ++ $(valid_iafter "${myservice}")" ++ else ++ startupservices="$(ineed "${myservice}") \ ++ $(valid_iuse "${myservice}")" ++ fi + fi + + # Start dependencies, if any +@@ -418,6 +420,8 @@ + --verbose) + RC_VERBOSE="yes" + ;; ++ --nodeps) ++ RC_NODEPS="yes" + esac + done + for arg in $* ; do +@@ -488,7 +492,7 @@ + svc_stop + svcpause="no" + ;; +- --quiet|--nocolor) ++ --quiet|--nocolor|--nodeps) + ;; + help) + exec "${svclib}"/sh/rc-help.sh "${myscript}" help |