| Message ID | 1465989309-12418-8-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On 15 Jun 2016, at 12:15, Wei Liu <wei.liu2@citrix.com> wrote: > > Move default the pid file under XEN_RUN_DIR. Note that it changes the > location from /var/run to /var/run/xen. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Dave Scott <dave@recoil.org> > --- > tools/ocaml/xenstored/xenstored.ml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml > index 30570ed..7ea4026 100644 > --- a/tools/ocaml/xenstored/xenstored.ml > +++ b/tools/ocaml/xenstored/xenstored.ml > @@ -81,7 +81,7 @@ let config_filename cf = > | Some name -> name > | None -> Define.default_config_dir ^ "/oxenstored.conf" > > -let default_pidfile = "/var/run/xenstored.pid" > +let default_pidfile = Paths.xen_run_dir ^ "/xenstored.pid" > > let ring_scan_interval = ref 20 > > -- > 2.1.4 > Looks fine to me. Acked-by: David Scott <dave@recoil.org>
Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> Move default the pid file under XEN_RUN_DIR. Note that it changes the
> location from /var/run to /var/run/xen.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian Jackson writes ("Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"):
> > Move default the pid file under XEN_RUN_DIR. Note that it changes the
> > location from /var/run to /var/run/xen.
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Actually, shouldn't this be combined with some init script patch, as
otherwise the tree is not bisectable ?
Ian.
On Fri, Jul 08, 2016 at 06:28:40PM +0100, Ian Jackson wrote: > Ian Jackson writes ("Re: [PATCH 7/7] oxenstored: honour XEN_RUN_DIR"): > > Wei Liu writes ("[PATCH 7/7] oxenstored: honour XEN_RUN_DIR"): > > > Move default the pid file under XEN_RUN_DIR. Note that it changes the > > > location from /var/run to /var/run/xen. > > > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> > > Actually, shouldn't this be combined with some init script patch, as > otherwise the tree is not bisectable ? > There is no init script to modify because oxenstored uses these paths in code by default. Wei. > Ian.
diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index 30570ed..7ea4026 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -81,7 +81,7 @@ let config_filename cf = | Some name -> name | None -> Define.default_config_dir ^ "/oxenstored.conf" -let default_pidfile = "/var/run/xenstored.pid" +let default_pidfile = Paths.xen_run_dir ^ "/xenstored.pid" let ring_scan_interval = ref 20
Move default the pid file under XEN_RUN_DIR. Note that it changes the location from /var/run to /var/run/xen. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Dave Scott <dave@recoil.org> --- tools/ocaml/xenstored/xenstored.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)