Daemon: The old daemon-helper has been declared obsolete

diff --git a/debug/default.cfg b/debug/default.cfg
index f6593577d8b76a72df39fce13921bce1e31a66c4..15bbeca7213f6bbee0b27e1dcbb778b9dfb90d52 100644 (file)
--- a/debug/default.cfg
+++ b/debug/default.cfg
@@ -7,6 +7,7 @@ UnSet("CONFIG_SHARED");
 Set("CONFIG_DEBUG");
 Set("CONFIG_UCW_DEBUG_TOOLS");
 Set("CONFIG_EXACT_CPU");
+Set("CONFIG_UCW_OBSOLETE_DAEMON_HELPER");
 
 Set("CONFIG_IMAGES");
 Set("CONFIG_CHARSET");

diff --git a/ucw/default.cfg b/ucw/default.cfg
index a85b77680c388c9172f87a6271f0ac70f3ac2b52..09d3658f61a60cb4fe9f28df5e8bf83ce30233f7 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -43,6 +43,9 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 # Include utilities
 Set("CONFIG_UCW_UTILS" => 1);
 
+# Include obsolete daemon-helper utility
+Set("CONFIG_UCW_OBSOLETE_DAEMON_HELPER" => 1);
+
 # Default configuration file
 UnSet("CONFIG_UCW_DEFAULT_CONFIG");
 

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 20de4727e26852960d2d9647efc52084a354ebda..b0068726712184007c56da4ae1071062fcb566e8 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -1,9 +1,13 @@
 # Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
 
-UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-helper daemon-control rotate-log urltool)
+UCW_UTILS=$(addprefix $(o)/ucw/utils/,basecode daemon-control rotate-log urltool)
 PROGS+=$(UCW_UTILS)
 DIRS+=ucw/utils
 
+ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER
+PROGS+=$(o)/ucw/utils/daemon-helper
+endif
+
 $(o)/ucw/utils/basecode: $(o)/ucw/utils/basecode.o $(LIBUCW)
 $(o)/ucw/utils/daemon-helper: $(o)/ucw/utils/daemon-helper.o $(LIBUCW)
 $(o)/ucw/utils/daemon-control: $(o)/ucw/utils/daemon-control.o $(LIBUCW)

diff --git a/ucw/utils/daemon-helper.c b/ucw/utils/daemon-helper.c
index 9996e81ff9b89ffd0ad89c1bfdfddaadf74855e5..2e7e682cb4a760a10e83da6b97f45fdc742026f5 100644 (file)
--- a/ucw/utils/daemon-helper.c
+++ b/ucw/utils/daemon-helper.c
@@ -11,6 +11,9 @@
  *     Return codes:
  *     101     already running
  *     102     not running
+ *
+ *     NOTE: This utility is obsolete and has been replaced by daemon-control.
+ *     You need to enable CONFIG_UCW_OBSOLETE_DAEMON_HELPER to compile it.
  */
 
 #include <ucw/lib.h>