* [PATCH 1/4] init/FreeBSD: set correct PATH for xl devd
2016-12-19 15:02 [PATCH 0/4] init/FreeBSD: Minor fixes for FreeBSD init scripts Roger Pau Monne
@ 2016-12-19 15:02 ` Roger Pau Monne
2016-12-21 11:48 ` Wei Liu
2016-12-19 15:02 ` [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd Roger Pau Monne
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-19 15:02 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Roger Pau Monne
FreeBSD init scripts don't have /usr/local/{bin/sbin} in it's PATH, which
prevents `xl devd` from working properly since hotplug scripts require the set
of xenstore cli tools to be in PATH.
While there also fix the usage of --pidfile, which according to the xl help
doesn't use "=", and add braces around XLDEVD_PIDFILE.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
index 8ece7c3..3917de2 100644
--- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
@@ -29,7 +29,7 @@ xendriverdomain_startcmd()
{
printf "Starting xenservices: xl devd."
- ${sbindir}/xl devd --pidfile=$XLDEVD_PIDFILE ${XLDEVD_ARGS}
+ PATH="${bindir}:${sbindir}:$PATH" ${sbindir}/xl devd --pidfile ${XLDEVD_PIDFILE} ${XLDEVD_ARGS}
printf "\n"
}
--
2.10.1 (Apple Git-78)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/4] init/FreeBSD: set correct PATH for xl devd
2016-12-19 15:02 ` [PATCH 1/4] init/FreeBSD: set correct PATH for xl devd Roger Pau Monne
@ 2016-12-21 11:48 ` Wei Liu
0 siblings, 0 replies; 12+ messages in thread
From: Wei Liu @ 2016-12-21 11:48 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Mon, Dec 19, 2016 at 03:02:01PM +0000, Roger Pau Monne wrote:
> FreeBSD init scripts don't have /usr/local/{bin/sbin} in it's PATH, which
> prevents `xl devd` from working properly since hotplug scripts require the set
> of xenstore cli tools to be in PATH.
>
> While there also fix the usage of --pidfile, which according to the xl help
> doesn't use "=", and add braces around XLDEVD_PIDFILE.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd
2016-12-19 15:02 [PATCH 0/4] init/FreeBSD: Minor fixes for FreeBSD init scripts Roger Pau Monne
2016-12-19 15:02 ` [PATCH 1/4] init/FreeBSD: set correct PATH for xl devd Roger Pau Monne
@ 2016-12-19 15:02 ` Roger Pau Monne
2016-12-21 11:48 ` Wei Liu
2016-12-19 15:02 ` [PATCH 3/4] init/FreeBSD: fix xencommons so it can only be launched by Dom0 Roger Pau Monne
2016-12-19 15:02 ` [PATCH 4/4] init/FreeBSD: add rc control variables Roger Pau Monne
3 siblings, 1 reply; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-19 15:02 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Roger Pau Monne
...because it's empty. While there also rename xendriverdomain_startcmd to
xendriverdomain_start in order to match the nomenclature of the file.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
index 3917de2..c71871c 100644
--- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
@@ -13,19 +13,13 @@ LD_LIBRARY_PATH="${libdir}"
export LD_LIBRARY_PATH
name="xendriverdomain"
-start_precmd="xendriverdomain_precmd"
start_cmd="xendriverdomain_startcmd"
stop_cmd="xendriverdomain_stop"
extra_commands=""
XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid"
-xendriverdomain_precmd()
-{
- :
-}
-
-xendriverdomain_startcmd()
+xendriverdomain_start()
{
printf "Starting xenservices: xl devd."
--
2.10.1 (Apple Git-78)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd
2016-12-19 15:02 ` [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd Roger Pau Monne
@ 2016-12-21 11:48 ` Wei Liu
2016-12-21 12:13 ` Roger Pau Monne
0 siblings, 1 reply; 12+ messages in thread
From: Wei Liu @ 2016-12-21 11:48 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Mon, Dec 19, 2016 at 03:02:02PM +0000, Roger Pau Monne wrote:
> ...because it's empty. While there also rename xendriverdomain_startcmd to
> xendriverdomain_start in order to match the nomenclature of the file.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> index 3917de2..c71871c 100644
> --- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> +++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> @@ -13,19 +13,13 @@ LD_LIBRARY_PATH="${libdir}"
> export LD_LIBRARY_PATH
>
> name="xendriverdomain"
> -start_precmd="xendriverdomain_precmd"
> start_cmd="xendriverdomain_startcmd"
^^^^^^^^
You missed this.
otherwise:
Acked-by: Wei Liu <wei.liu2@citrix.com>
> stop_cmd="xendriverdomain_stop"
> extra_commands=""
>
> XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid"
>
> -xendriverdomain_precmd()
> -{
> - :
> -}
> -
> -xendriverdomain_startcmd()
> +xendriverdomain_start()
> {
> printf "Starting xenservices: xl devd."
>
> --
> 2.10.1 (Apple Git-78)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd
2016-12-21 11:48 ` Wei Liu
@ 2016-12-21 12:13 ` Roger Pau Monne
0 siblings, 0 replies; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-21 12:13 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, Ian Jackson
On Wed, Dec 21, 2016 at 11:48:40AM +0000, Wei Liu wrote:
> On Mon, Dec 19, 2016 at 03:02:02PM +0000, Roger Pau Monne wrote:
> > ...because it's empty. While there also rename xendriverdomain_startcmd to
> > xendriverdomain_start in order to match the nomenclature of the file.
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > ---
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > ---
> > tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 8 +-------
> > 1 file changed, 1 insertion(+), 7 deletions(-)
> >
> > diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> > index 3917de2..c71871c 100644
> > --- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> > +++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> > @@ -13,19 +13,13 @@ LD_LIBRARY_PATH="${libdir}"
> > export LD_LIBRARY_PATH
> >
> > name="xendriverdomain"
> > -start_precmd="xendriverdomain_precmd"
> > start_cmd="xendriverdomain_startcmd"
> ^^^^^^^^
> You missed this.
>
> otherwise:
>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
Would you like to fix this while committing, or should I push the updated
series to a git branch?
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] init/FreeBSD: fix xencommons so it can only be launched by Dom0
2016-12-19 15:02 [PATCH 0/4] init/FreeBSD: Minor fixes for FreeBSD init scripts Roger Pau Monne
2016-12-19 15:02 ` [PATCH 1/4] init/FreeBSD: set correct PATH for xl devd Roger Pau Monne
2016-12-19 15:02 ` [PATCH 2/4] init/FreeBSD: remove xendriverdomain_precmd Roger Pau Monne
@ 2016-12-19 15:02 ` Roger Pau Monne
2016-12-21 11:48 ` Wei Liu
2016-12-19 15:02 ` [PATCH 4/4] init/FreeBSD: add rc control variables Roger Pau Monne
3 siblings, 1 reply; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-19 15:02 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Roger Pau Monne
At the moment the execution of xencommons is gated on the presence of the
privcmd device, but that's not correct, since privcmd is available to all Xen
domains (privileged or unprivileged). Instead of using privcmd use the
xenstored device, which will only be available to the domain that's in charge
of running xenstored, and thus xencommons.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index efa8801..81f69f3 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -16,7 +16,7 @@ start_cmd="xen_startcmd"
stop_cmd="xen_stop"
status_cmd="xen_status"
extra_commands="status"
-required_files="/dev/xen/privcmd"
+required_files="/dev/xen/xenstored"
XENSTORED_PIDFILE="@XEN_RUN_DIR@/xenstored.pid"
XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
--
2.10.1 (Apple Git-78)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 3/4] init/FreeBSD: fix xencommons so it can only be launched by Dom0
2016-12-19 15:02 ` [PATCH 3/4] init/FreeBSD: fix xencommons so it can only be launched by Dom0 Roger Pau Monne
@ 2016-12-21 11:48 ` Wei Liu
0 siblings, 0 replies; 12+ messages in thread
From: Wei Liu @ 2016-12-21 11:48 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Mon, Dec 19, 2016 at 03:02:03PM +0000, Roger Pau Monne wrote:
> At the moment the execution of xencommons is gated on the presence of the
> privcmd device, but that's not correct, since privcmd is available to all Xen
> domains (privileged or unprivileged). Instead of using privcmd use the
> xenstored device, which will only be available to the domain that's in charge
> of running xenstored, and thus xencommons.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] init/FreeBSD: add rc control variables
2016-12-19 15:02 [PATCH 0/4] init/FreeBSD: Minor fixes for FreeBSD init scripts Roger Pau Monne
` (2 preceding siblings ...)
2016-12-19 15:02 ` [PATCH 3/4] init/FreeBSD: fix xencommons so it can only be launched by Dom0 Roger Pau Monne
@ 2016-12-19 15:02 ` Roger Pau Monne
2016-12-21 11:49 ` Wei Liu
3 siblings, 1 reply; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-19 15:02 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Roger Pau Monne
Those are used in order to decide which scripts are executed at init.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/FreeBSD/rc.d/xencommons.in | 5 ++++-
tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index 81f69f3..2fcd84a 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -11,6 +11,7 @@ LD_LIBRARY_PATH="${libdir}"
export LD_LIBRARY_PATH
name="xencommons"
+rcvar="xencommons_enable"
start_precmd="xen_precmd"
start_cmd="xen_startcmd"
stop_cmd="xen_stop"
@@ -23,6 +24,9 @@ XENCONSOLED_PIDFILE="@XEN_RUN_DIR@/xenconsoled.pid"
#XENCONSOLED_TRACE="@XEN_LOG_DIR@/xenconsole-trace.log"
#XENSTORED_TRACE="@XEN_LOG_DIR@/xen/xenstore-trace.log"
+load_rc_config $name
+: ${xencommons_enable:=no}
+
xen_precmd()
{
mkdir -p @XEN_LIB_STORED@ || exit 1
@@ -116,5 +120,4 @@ xen_status()
fi
}
-load_rc_config $name
run_rc_command "$1"
diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
index c71871c..1384fdd 100644
--- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
@@ -13,12 +13,16 @@ LD_LIBRARY_PATH="${libdir}"
export LD_LIBRARY_PATH
name="xendriverdomain"
+rcvar="xendriverdomain_enable"
start_cmd="xendriverdomain_startcmd"
stop_cmd="xendriverdomain_stop"
extra_commands=""
XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid"
+load_rc_config $name
+: ${xendriverdomain_enable:=no}
+
xendriverdomain_start()
{
printf "Starting xenservices: xl devd."
@@ -38,5 +42,4 @@ xendriverdomain_stop()
wait_for_pids $rc_pids
}
-load_rc_config $name
run_rc_command "$1"
--
2.10.1 (Apple Git-78)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 4/4] init/FreeBSD: add rc control variables
2016-12-19 15:02 ` [PATCH 4/4] init/FreeBSD: add rc control variables Roger Pau Monne
@ 2016-12-21 11:49 ` Wei Liu
2016-12-21 12:12 ` Roger Pau Monne
0 siblings, 1 reply; 12+ messages in thread
From: Wei Liu @ 2016-12-21 11:49 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Mon, Dec 19, 2016 at 03:02:04PM +0000, Roger Pau Monne wrote:
> Those are used in order to decide which scripts are executed at init.
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Can't say I know much about FreeBSD init mechanism, but I trust your
judgement:
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4] init/FreeBSD: add rc control variables
2016-12-21 11:49 ` Wei Liu
@ 2016-12-21 12:12 ` Roger Pau Monne
2016-12-21 16:38 ` Wei Liu
0 siblings, 1 reply; 12+ messages in thread
From: Roger Pau Monne @ 2016-12-21 12:12 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, Ian Jackson
On Wed, Dec 21, 2016 at 11:49:29AM +0000, Wei Liu wrote:
> On Mon, Dec 19, 2016 at 03:02:04PM +0000, Roger Pau Monne wrote:
> > Those are used in order to decide which scripts are executed at init.
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>
>
> Can't say I know much about FreeBSD init mechanism, but I trust your
> judgement:
>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
Not that I know a lot myself, I just followed the advice at
https://www.freebsd.org/doc/en/articles/rc-scripting/article.html#rcng-confdummy
Maybe we should add this url ref to the commit itself?
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4] init/FreeBSD: add rc control variables
2016-12-21 12:12 ` Roger Pau Monne
@ 2016-12-21 16:38 ` Wei Liu
0 siblings, 0 replies; 12+ messages in thread
From: Wei Liu @ 2016-12-21 16:38 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Wei Liu, Ian Jackson
On Wed, Dec 21, 2016 at 12:12:06PM +0000, Roger Pau Monne wrote:
> On Wed, Dec 21, 2016 at 11:49:29AM +0000, Wei Liu wrote:
> > On Mon, Dec 19, 2016 at 03:02:04PM +0000, Roger Pau Monne wrote:
> > > Those are used in order to decide which scripts are executed at init.
> > >
> > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> >
> >
> > Can't say I know much about FreeBSD init mechanism, but I trust your
> > judgement:
> >
> > Acked-by: Wei Liu <wei.liu2@citrix.com>
>
> Not that I know a lot myself, I just followed the advice at
>
> https://www.freebsd.org/doc/en/articles/rc-scripting/article.html#rcng-confdummy
>
> Maybe we should add this url ref to the commit itself?
I've edited the commit message here and fixed the error in the other
commit and pushed this series to staging.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread