git://git.onelab.eu
/
vsys.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build fix
[vsys.git]
/
conffile.ml
diff --git
a/conffile.ml
b/conffile.ml
index
d9fe129
..
0d0f0f1
100644
(file)
--- a/
conffile.ml
+++ b/
conffile.ml
@@
-5,6
+5,15
@@
open Scanf
let split_conf_line s =
sscanf s "%s %s" (fun s1 s2->(s1,s2))
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 ->
let rec in_list elt lst =
match lst with
| car::cdr ->
@@
-12,14
+21,15
@@
let rec in_list elt lst =
| [] -> false
let read_frontends f =
| [] -> 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) ->
let fe = split_conf_line inp_line in
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) ->
let fe = split_conf_line inp_line in
- let new_list = if (not (in_list fe cur_list)) then (fe::cur_list) else cur_list
+ 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 new_list
| None -> cur_list