| 8 | 8 |
|
| 9 | 9 |
--- a/sh/gendepends.sh.in
|
| 10 | 10 |
+++ b/sh/gendepends.sh.in
|
| 11 | |
@@ -51,12 +51,14 @@
|
|
11 |
@@ -51,12 +51,14 @@ do
|
| 12 | 12 |
for RC_SERVICE in *; do
|
| 13 | 13 |
[ -x "$RC_SERVICE" -a -f "$RC_SERVICE" ] || continue
|
| 14 | 14 |
|
|
| 24 | 24 |
continue
|
| 25 | 25 |
unset one two three
|
| 26 | 26 |
|
| 27 | |
@@ -83,10 +85,13 @@
|
|
27 |
@@ -83,10 +85,13 @@ do
|
| 28 | 28 |
|
| 29 | 29 |
[ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
|
| 30 | 30 |
|
|
| 43 | 43 |
done
|
| 44 | 44 |
--- a/sh/runscript.sh.in
|
| 45 | 45 |
+++ b/sh/runscript.sh.in
|
| 46 | |
@@ -223,28 +223,33 @@
|
|
46 |
@@ -223,28 +223,33 @@ fi
|
| 47 | 47 |
cgroup_set_limits
|
| 48 | 48 |
|
| 49 | 49 |
# Load our script
|
|
| 98 | 98 |
fi
|
| 99 | 99 |
|
| 100 | 100 |
while [ -n "$1" ]; do
|
| 101 | |
@@ -258,7 +263,12 @@
|
|
101 |
@@ -258,7 +263,19 @@ while [ -n "$1" ]; do
|
| 102 | 102 |
_depend
|
| 103 | 103 |
cd /
|
| 104 | 104 |
continue
|
| 105 | 105 |
+ elif [ -n "${lsbh}" ]; then
|
| 106 | |
+ . "${RC_SERVICE}"
|
|
106 |
+ export CHILD=$((CHILD+1))
|
|
107 |
+ SHEllBANG=$(sed -n '1s/#!//p' "$RC_SERVICE")
|
|
108 |
+ if [ ! -z "$(echo $SHEllBANG|grep /bin/sh)" -o $CHILD -eq 2 ]; then
|
|
109 |
+ . "${RC_SERVICE}"
|
|
110 |
+ else
|
|
111 |
+ $SHEllBANG $0 "${RC_SERVICE}" $*
|
|
112 |
+ exit 0
|
|
113 |
+ fi
|
| 107 | 114 |
+ shift
|
| 108 | 115 |
+ continue
|
| 109 | 116 |
fi
|
|
| 124 | 131 |
SUBDIR+= tools
|
| 125 | 132 |
--- a/src/librc/librc-depend.c
|
| 126 | 133 |
+++ b/src/librc/librc-depend.c
|
| 127 | |
@@ -1537,14 +1537,6 @@
|
|
134 |
@@ -1537,14 +1537,6 @@ rc_deptree_update(void)
|
| 128 | 135 |
strcmp(depend, service) == 0)
|
| 129 | 136 |
continue;
|
| 130 | 137 |
|
|
| 141 | 148 |
rc_stringlist_delete(deptype->services, depend + 1);
|
| 142 | 149 |
--- a/src/librc/librc.c
|
| 143 | 150 |
+++ b/src/librc/librc.c
|
| 144 | |
@@ -91,13 +91,6 @@
|
|
151 |
@@ -91,13 +91,6 @@ ls_dir(const char *dir, int options)
|
| 145 | 152 |
r = stat(file, &buf);
|
| 146 | 153 |
if (r != 0)
|
| 147 | 154 |
continue;
|
|
| 155 | 162 |
}
|
| 156 | 163 |
if (options & LS_DIR) {
|
| 157 | 164 |
if (stat(d->d_name, &buf) == 0 &&
|
| 158 | |
@@ -533,16 +526,6 @@
|
|
165 |
@@ -533,16 +526,6 @@ rc_service_exists(const char *service)
|
| 159 | 166 |
errno = EINVAL;
|
| 160 | 167 |
return false;
|
| 161 | 168 |
}
|
|
| 248 | 255 |
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| 249 | 256 |
--- a/src/rc/rc-misc.c
|
| 250 | 257 |
+++ b/src/rc/rc-misc.c
|
| 251 | |
@@ -296,7 +296,7 @@
|
|
258 |
@@ -296,7 +296,7 @@ exec_service(const char *service, const
|
| 252 | 259 |
sigprocmask(SIG_SETMASK, &old, NULL);
|
| 253 | 260 |
|
| 254 | 261 |
/* Safe to run now */
|