update documentation

doc/66-disable.md

@@ -10,7 +10,7 @@ author: Eric Vidal <eric@obarun.org>
 ## Interface
 
 ```
-    66-disable [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -S ] service(s)
+    66-disable [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] [ -S ] [ -F ] service(s)
 ```
 
 This tool expects to find an already enabled *service* inside the given *tree*. The targeted service(s) can also be stopped on the fly when disabling it with the **-S** option. Generally speaking this command is the strict opposite of the [66-enable](66-enable.html) tool. 
@@ -41,6 +41,8 @@ Multiple *services* can be disabled by seperating their names with a space.
 
 - **-S** : stops the *service* on the fly directly after enabling it. If the state of the *service* is already up, this option will have no effect unless the **-f** option is used to reload it.
 
+- **-F** : forces the *service* to be disabled even if it's already marked disabled. The *service* **must** be marked uninitialized —see [66-intree](66-intree.html). The dependency of the *service* is **not** handled except for its associated logger. Also, this option cannot be used for a logger service. This option should only be used when a inconsistent state exist between the actual contain of the compiled service database and the display of the contents of a tree with the [66-intree](66-intree.html) command. For example, if you disable a service and a power failure occur, the service will be marked uninitialized and disabled at the next boot inside your tree. In this case use this option to cleanup your tree.
+
 ## Dependencies handling
 
 In case of `bundle`, `module` or `'atomic'` services, any dependency chain will be automatically resolved. It is unnecessary to manually define chained sets of dependencies. If FooA has a declared dependency on FooB, FooB will be automatically disabled as well when disabling FooA. This will run recursively until all dependencies are disabled.

src/lib66/ssexec_disable.c

@@ -76,18 +76,18 @@ int svc_remove(genalloc *tostop,ss_resolve_t *res, char const *src,ssexec_t *inf
 			log_warnusys("resolve recursive dependencies of: ",name) ;
 			goto err ;
 		}
-	
-		if (!ss_resolve_add_logger(&rdeps,src))
-		{
-			log_warnusys("resolve logger") ;
-			goto err ;
-		}
 	}
 	else
 	{
 		if (!ss_resolve_append(&rdeps,&cp)) goto err ;
 	}
 
+	if (!ss_resolve_add_logger(&rdeps,src))
+	{
+		log_warnusys("resolve logger") ;
+		goto err ;
+	}
+
 	ss_resolve_free(&cp) ;
 
 	for (;i < genalloc_len(ss_resolve_t,&rdeps) ; i++)

src/lib66/ssexec_help.c

@@ -51,7 +51,7 @@ char const *help_dbctl =
 "	-r: reload service\n"
 ;
 
-char const *usage_disable = "66-disable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] service(s)" ;
+char const *usage_disable = "66-disable [ -h ] [ -z ] [ -v verbosity ] [ - l live ] [ -t tree ] [ -S ] [ -F ] service(s)" ;
 
 char const *help_disable =
 "66-disable <options> service(s)\n"
@@ -63,6 +63,7 @@ char const *help_disable =
 "	-l: live directory\n"
 "	-t: name of the tree to use\n"
 "	-S: disable and stop the service\n"
+"	-F: forces to disable the service\n"
 ;
 
 char const *usage_init = "66-init [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -t tree ] classic|database|both" ;