diff mbox

init/FreeBSD: fix incorrect usage of $rc_pids in xendriverdomain

Message ID 20161221164726.7914-1-roger.pau@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Roger Pau Monne Dec. 21, 2016, 4:47 p.m. UTC
It should be rc_pid.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reported-by: Nathan Friess <nathan.friess@gmail.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Wei Liu Dec. 21, 2016, 4:53 p.m. UTC | #1
On Wed, Dec 21, 2016 at 04:47:26PM +0000, Roger Pau Monne wrote:
> It should be rc_pid.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Reported-by: Nathan Friess <nathan.friess@gmail.com>

Acked + applied.

I suspect all the patches to fix FreeBSD init script should be
backported?

> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> index b01a470..a032822 100644
> --- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> +++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
> @@ -38,8 +38,8 @@ xendriverdomain_stop()
>  
>  	rc_pid=$(check_pidfile ${XLDEVD_PIDFILE} ${sbindir}/xl)
>  
> -	kill -${sig_stop:-TERM} $rc_pids
> -	wait_for_pids $rc_pids
> +	kill -${sig_stop:-TERM} $rc_pid
> +	wait_for_pids $rc_pid
>  }
>  
>  run_rc_command "$1"
> -- 
> 2.10.1 (Apple Git-78)
>
Roger Pau Monne Dec. 22, 2016, 10:51 a.m. UTC | #2
On Wed, Dec 21, 2016 at 04:53:52PM +0000, Wei Liu wrote:
> On Wed, Dec 21, 2016 at 04:47:26PM +0000, Roger Pau Monne wrote:
> > It should be rc_pid.
> > 
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > Reported-by: Nathan Friess <nathan.friess@gmail.com>
> 
> Acked + applied.
> 
> I suspect all the patches to fix FreeBSD init script should be
> backported?

Yes, that would be nice. I plan to apply them to the packages in the FreeBSD
ports tree, which AFAIK is what most people tend to use in order to run Xen on
FreeBSD.

Roger.
Ian Jackson Dec. 22, 2016, 10:57 a.m. UTC | #3
Roger Pau Monne writes ("Re: [PATCH] init/FreeBSD: fix incorrect usage of $rc_pids in xendriverdomain"):
> On Wed, Dec 21, 2016 at 04:53:52PM +0000, Wei Liu wrote:
> > I suspect all the patches to fix FreeBSD init script should be
> > backported?
> 
> Yes, that would be nice. I plan to apply them to the packages in the FreeBSD
> ports tree, which AFAIK is what most people tend to use in order to run Xen on
> FreeBSD.

I have made a note in my backport queue.

Thanks,
Ian.
diff mbox

Patch

diff --git a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
index b01a470..a032822 100644
--- a/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
+++ b/tools/hotplug/FreeBSD/rc.d/xendriverdomain.in
@@ -38,8 +38,8 @@  xendriverdomain_stop()
 
 	rc_pid=$(check_pidfile ${XLDEVD_PIDFILE} ${sbindir}/xl)
 
-	kill -${sig_stop:-TERM} $rc_pids
-	wait_for_pids $rc_pids
+	kill -${sig_stop:-TERM} $rc_pid
+	wait_for_pids $rc_pid
 }
 
 run_rc_command "$1"