From 983061db31e02d62359dd8a0cb1e9f125950cfdb Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 13 Aug 2015 20:26:47 +0000
Subject:  - add support for --livedir  - doc fixes

---
 src/include/s6-rc/s6rc-constants.h | 3 ---
 src/s6-rc/s6-rc-db.c               | 1 +
 src/s6-rc/s6-rc-init.c             | 1 +
 src/s6-rc/s6-rc-update.c           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/include/s6-rc/s6rc-constants.h b/src/include/s6-rc/s6rc-constants.h
index 87e7053..168dac8 100644
--- a/src/include/s6-rc/s6rc-constants.h
+++ b/src/include/s6-rc/s6rc-constants.h
@@ -4,9 +4,6 @@
 #define S6RC_CONSTANTS_H
 
 #define S6RC_COMPILED_BASE "/etc/s6-rc/compiled"
-#define S6RC_LIVE_BASE "/run/s6-rc"
-
-#define S6RC_COMPILED_DIR_LEN 32
 
 #define S6RC_ONESHOT_RUNNER "s6rc-oneshot-runner"
 #define S6RC_ONESHOT_RUNNER_LEN (sizeof S6RC_ONESHOT_RUNNER - 1)
diff --git a/src/s6-rc/s6-rc-db.c b/src/s6-rc/s6-rc-db.c
index 8621b6c..97f0956 100644
--- a/src/s6-rc/s6-rc-db.c
+++ b/src/s6-rc/s6-rc-db.c
@@ -19,6 +19,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 #include <s6/config.h>
+#include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
 #define USAGE "s6-rc-db [ -u | -d ] [ -l live ] [ -c compiled ] command... (use s6-rc-db help for more information)"
diff --git a/src/s6-rc/s6-rc-init.c b/src/s6-rc/s6-rc-init.c
index e34ed18..4ea30d0 100644
--- a/src/s6-rc/s6-rc-init.c
+++ b/src/s6-rc/s6-rc-init.c
@@ -14,6 +14,7 @@
 #include <s6/s6-supervise.h>
 #include <s6/ftrigw.h>
 #include <s6/ftrigr.h>
+#include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
 #define USAGE "s6-rc-init [ -c compiled ] [ -l live ] [ -t timeout ] scandir"
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index 08f719f..d7d0e4e 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -393,7 +393,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   tain_t deadline ;
   int dryrun = 0 ;
   PROG = "s6-rc-update" ;
-  strerr_dief1x(100, "this utility has not been written yet.") ;
+  strerr_dief1x(100, "will you please stop trying to run this? It's not ready!") ;
   {
     unsigned int t = 0 ;
     subgetopt_t l = SUBGETOPT_ZERO ;
-- 
cgit v1.2.3