summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-06-11 11:08:46 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-06-11 11:08:46 +0000
commit5fbf98106a24931071e2faf84cb9c39455cbb6d7 (patch)
treeff27ce23afb603ce088966cabf6f522cd346eb14
parent04025bdc6c15c307ffa4fbcf39eec39024b9b935 (diff)
downloads6-rc-5fbf98106a24931071e2faf84cb9c39455cbb6d7.tar.xz
Tentative fix for examine
-rw-r--r--src/s6-rc/s6-rc-compile.c2
-rw-r--r--src/s6-rc/s6-rc.c9
2 files changed, 4 insertions, 7 deletions
diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c
index 3e41ac1..208f451 100644
--- a/src/s6-rc/s6-rc-compile.c
+++ b/src/s6-rc/s6-rc-compile.c
@@ -42,7 +42,7 @@ EXECLINE_EXTBINPREFIX "fdmove -c 2 1\n" \
S6_EXTBINPREFIX "s6-ipcserver-socketbinder -- s\n" \
S6_EXTBINPREFIX "s6-notifywhenup -f --\n" \
S6_EXTBINPREFIX "s6-ipcserverd -1 --\n" \
-S6_EXTBINPREFIX "s6-ipcserver-access -E -l0 -i data/rules --\n" \
+S6_EXTBINPREFIX "s6-ipcserver-access -v0 -E -l0 -i data/rules --\n" \
S6_EXTBINPREFIX "s6-sudod -t 2000 --\n"
static unsigned int verbosity = 1 ;
diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c
index ad69d5d..d83f77d 100644
--- a/src/s6-rc/s6-rc.c
+++ b/src/s6-rc/s6-rc.c
@@ -169,12 +169,9 @@ static void broadcast_success (unsigned int, int) ;
static void examine (unsigned int i, int h)
{
- char const *name = db->string + db->services[i].name ;
- if (verbosity >= 3)
- strerr_warni2x("examining ", name) ;
-
- if (!pendingdeps[i] && !(state[i] & 4))
+ if (state[i] & 2 && !pendingdeps[i] && !(state[i] & 4))
{
+ char const *name = db->string + db->services[i].name ;
state[i] |= 4 ;
if ((state[i] & 1) == h)
{
@@ -294,7 +291,7 @@ static int doit (int spfd, int h)
pendingdeps[i] = db->services[i].ndeps[h] ;
}
i = n ;
- while (i--) if (state[i] & 2) examine(i, h) ;
+ while (i--) examine(i, h) ;
for (;;)
{