X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=conffile.ml;h=0d0f0f1f6796ca98813afa50b208ddb63911f67d;hp=21175e9e6968bebf4a4709d03eccbe7dfee6d796;hb=26326ab885a36f7e0661703b735109df36520b30;hpb=87c0dc3957634fe643267904d0cedfed80a03f68

diff --git a/conffile.ml b/conffile.ml
index 21175e9..0d0f0f1 100644
--- a/conffile.ml
+++ b/conffile.ml
@@ -5,13 +5,33 @@ open Scanf
 let split_conf_line s =
   sscanf s "%s %s" (fun s1 s2->(s1,s2))
 
+let check_dir fe = 
+  let (vsysdir,slice) = fe in
+  let verdict = try Some(Unix.stat vsysdir) with
+      _ -> logprint "vsys directory not setup for slice %s\n" slice;None
+  in
+    match verdict with 
+      | None->false 
+      | Some(_) -> true
+
+let rec in_list elt lst =
+  match lst with 
+    | car::cdr ->
+        if (elt = car) then true else in_list elt cdr
+    | [] -> false
+
 let read_frontends f =
-  let f_file = try open_in f with e -> fprintf logfd "Could not open config file\n";flush logfd;raise e
+  let setup_ok = if (!Globals.failsafe) then check_dir else fun _ -> true in
+  let f_file = try open_in f with e -> logprint "Could not open config file\n";raise e
   in
   let rec read_conf_file cur_list =
     let next_line = try Some(input_line f_file) with _ -> None in
       match next_line with
-        | Some(inp_line) -> read_conf_file (split_conf_line(inp_line)::cur_list)
+        | Some(inp_line) -> 
+            let fe = split_conf_line inp_line in
+            let new_list = if (not (in_list fe cur_list) && (setup_ok(fe))) then (fe::cur_list) else cur_list
+            in
+            read_conf_file new_list
         | None -> cur_list
   in
     read_conf_file []