oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR

Only contain changes to ocaml source code. C stub files will be handled
separately.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: David Scott <dave@recoil.org>

diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml
index d60861ca34051d493fee870bfc2c484bc0d0452b..e9d957ff6aadf0e9bedf6bd306139d8a10c4cc55 100644 (file)
--- a/tools/ocaml/xenstored/define.ml
+++ b/tools/ocaml/xenstored/define.ml
@@ -20,10 +20,10 @@ let xenstored_minor = 0
 let xenstored_proc_kva = "/proc/xen/xsd_kva"
 let xenstored_proc_port = "/proc/xen/xsd_port"
 
-let xs_daemon_socket = "/var/run/xenstored/socket"
-let xs_daemon_socket_ro = "/var/run/xenstored/socket_ro"
+let xs_daemon_socket = Paths.xen_run_stored ^ "/socket"
+let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro"
 
-let default_config_dir = "/etc/xen"
+let default_config_dir = Paths.xen_config_dir
 
 let maxwatch = ref (50)
 let maxtransaction = ref (20)

diff --git a/tools/ocaml/xenstored/disk.ml b/tools/ocaml/xenstored/disk.ml
index 4ae1fce0fb4a32372018197980202b86ee5f8f78..4739967b611736d4568e81f1ee29fdd7f3b497ff 100644 (file)
--- a/tools/ocaml/xenstored/disk.ml
+++ b/tools/ocaml/xenstored/disk.ml
@@ -15,7 +15,7 @@
  *)
 
 let enable = ref false
-let xs_daemon_database = "/var/run/xenstored/db"
+let xs_daemon_database = Paths.xen_run_stored ^ "/db"
 
 let error fmt = Logging.error "disk" fmt
 

diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
index fc8cc95d2e1c8009b5ad9856bfb6597e90045c9b..30570eda745d8271568662835c07ec0c9feba581 100644 (file)
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -66,7 +66,7 @@ let process_domains store cons domains =
 let sigusr1_handler store =
        try
                let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; ]
-                                          0o600 "/var/run/xenstored/db.debug" in
+                                          0o600 (Paths.xen_run_stored ^ "/db.debug") in
                finally (fun () -> Store.dump store channel)
                        (fun () -> close_out channel)
        with _ ->
@@ -266,7 +266,7 @@ let _ =
        let quit = ref false in
 
        if cf.restart then (
-               DB.from_file store domains cons "/var/run/xenstored/db";
+               DB.from_file store domains cons (Paths.xen_run_stored ^ "/db");
                Event.bind_dom_exc_virq eventchn
        ) else (
                if !Disk.enable then (
@@ -293,7 +293,7 @@ let _ =
 
        Logging.init_xenstored_log();
        if cf.activate_access_log then begin
-               let post_rotate () = DB.to_file store cons "/var/run/xenstored/db" in
+               let post_rotate () = DB.to_file store cons (Paths.xen_run_stored ^ "/db") in
                Logging.init_access_log post_rotate
        end;
 
@@ -440,5 +440,5 @@ let _ =
                                raise exc
        done;
        info "stopping xenstored";
-       DB.to_file store cons "/var/run/xenstored/db";
+       DB.to_file store cons (Paths.xen_run_stored ^ "/db");
        ()