3 | 3 |
Last-Update: 2014-01-27
|
4 | 4 |
Origin: https://github.com/xaionaro/openrc
|
5 | 5 |
|
6 | |
Index: openrc/src/includes/helpers.h
|
7 | |
===================================================================
|
8 | |
--- openrc.orig/src/includes/helpers.h 2014-10-25 12:32:12.154554898 +0530
|
9 | |
+++ openrc/src/includes/helpers.h 2014-10-25 12:32:12.142554898 +0530
|
|
6 |
--- a/src/includes/helpers.h
|
|
7 |
+++ b/src/includes/helpers.h
|
10 | 8 |
@@ -32,6 +32,7 @@
|
11 | 9 |
#define __HELPERS_H__
|
12 | 10 |
|
|
64 | 62 |
#undef ERRX
|
65 | 63 |
|
66 | 64 |
/* basename_c never modifies the argument. As such, if there is a trailing
|
67 | |
Index: openrc/src/test/units/early_loop_detector
|
68 | |
===================================================================
|
69 | |
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
70 | |
+++ openrc/src/test/units/early_loop_detector 2014-10-25 12:32:12.142554898 +0530
|
|
65 |
--- /dev/null
|
|
66 |
+++ b/src/test/units/early_loop_detector
|
71 | 67 |
@@ -0,0 +1,196 @@
|
72 | 68 |
+#!/bin/sh
|
73 | 69 |
+# unit test for the code of early loop detector (2014-01-27)
|
|
265 | 261 |
+
|
266 | 262 |
+run_test
|
267 | 263 |
+exit $?
|
268 | |
Index: openrc/src/librc/Makefile
|
269 | |
===================================================================
|
270 | |
--- openrc.orig/src/librc/Makefile 2014-10-25 12:32:12.154554898 +0530
|
271 | |
+++ openrc/src/librc/Makefile 2014-10-25 12:32:12.146554898 +0530
|
|
264 |
--- a/src/librc/Makefile
|
|
265 |
+++ b/src/librc/Makefile
|
272 | 266 |
@@ -5,9 +5,10 @@
|
273 | 267 |
INCS= rc.h
|
274 | 268 |
VERSION_MAP= rc.map
|
|
282 | 276 |
|
283 | 277 |
MK= ../../mk
|
284 | 278 |
include ${MK}/lib.mk
|
285 | |
Index: openrc/etc/rc.conf.in
|
286 | |
===================================================================
|
287 | |
--- openrc.orig/etc/rc.conf.in 2014-10-25 12:32:12.154554898 +0530
|
288 | |
+++ openrc/etc/rc.conf.in 2014-10-25 12:32:32.830554528 +0530
|
|
279 |
--- a/etc/rc.conf.in
|
|
280 |
+++ b/etc/rc.conf.in
|
289 | 281 |
@@ -143,3 +143,9 @@
|
290 | 282 |
# This is mainly used for saying which servies do NOT provide net.
|
291 | 283 |
#rc_net_tap0_provide="!net"
|
|
296 | 288 |
+# Comment this line to disable warnings about dependency loops
|
297 | 289 |
+rc_loopsolver_warnings="YES"
|
298 | 290 |
+
|
299 | |
Index: openrc/src/librc/rc.h.in
|
300 | |
===================================================================
|
301 | |
--- openrc.orig/src/librc/rc.h.in 2014-10-25 12:32:12.154554898 +0530
|
302 | |
+++ openrc/src/librc/rc.h.in 2014-10-25 12:32:12.146554898 +0530
|
|
291 |
--- a/src/librc/rc.h.in
|
|
292 |
+++ b/src/librc/rc.h.in
|
303 | 293 |
@@ -373,13 +373,26 @@
|
304 | 294 |
* @return pointer to the value, otherwise NULL */
|
305 | 295 |
char *rc_proc_getent(const char *);
|
|
328 | 318 |
|
329 | 319 |
/*! Check if the cached dependency tree is older than any init script,
|
330 | 320 |
* its configuration file or an external configuration file the init script
|
331 | |
Index: openrc/src/rc/rc-depend.c
|
332 | |
===================================================================
|
333 | |
--- openrc.orig/src/rc/rc-depend.c 2014-10-25 12:32:12.154554898 +0530
|
334 | |
+++ openrc/src/rc/rc-depend.c 2014-10-25 12:32:12.150554898 +0530
|
|
321 |
--- a/src/rc/rc-depend.c
|
|
322 |
+++ b/src/rc/rc-depend.c
|
335 | 323 |
@@ -76,7 +76,13 @@
|
336 | 324 |
if (regen)
|
337 | 325 |
*regen = 1;
|
|
347 | 335 |
eend (retval, "Failed to update the dependency tree");
|
348 | 336 |
|
349 | 337 |
if (retval == 0) {
|
350 | |
Index: openrc/src/librc/librc-depend.c
|
351 | |
===================================================================
|
352 | |
--- openrc.orig/src/librc/librc-depend.c 2014-10-25 12:32:12.154554898 +0530
|
353 | |
+++ openrc/src/librc/librc-depend.c 2014-10-25 12:32:12.150554898 +0530
|
|
338 |
--- a/src/librc/librc-depend.c
|
|
339 |
+++ b/src/librc/librc-depend.c
|
354 | 340 |
@@ -29,12 +29,43 @@
|
355 | 341 |
*/
|
356 | 342 |
|
|
1245 | 1231 |
Now that we're purely in C, do we need to keep a shell parseable file?
|
1246 | 1232 |
I think yes as then it stays human readable
|
1247 | 1233 |
This works and should be entirely shell parseable provided that depend
|
|
1234 |
--- a/src/test/runtests.sh
|
|
1235 |
+++ b/src/test/runtests.sh
|
|
1236 |
@@ -60,7 +60,7 @@
|
|
1237 |
| egrep -v -e 'R_PARISC_(DP|SEG)REL' \
|
|
1238 |
| awk '$5 ~ /^rc_/ {print $5}' \
|
|
1239 |
| LC_ALL=C sort -u \
|
|
1240 |
- | egrep -v '^rc_environ_fd$' \
|
|
1241 |
+ | egrep -v '^rc_environ_fd$|^rc_deptree_remove_loopdependency' \
|
|
1242 |
> librc.funcs.hidden.out
|
|
1243 |
syms=$(diff -u librc.funcs.hidden.list librc.funcs.hidden.out | sed -n '/^+[^+]/s:^+::p')
|
|
1244 |
[ -z "${syms}" ]
|