[Xen-changelog] [xen stable-4.6] init/FreeBSD: add rc control variables

[patchbot@xxxxxxx]

commit 2109ae695302afa0e0466086d383569814bd7725
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Mon Dec 19 15:02:04 2016 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Fri Jan 20 17:38:29 2017 +0000

    init/FreeBSD: add rc control variables
    
    Those are used in order to decide which scripts are executed at init.
    
    Ref: 
https://www.freebsd.org/doc/en/articles/rc-scripting/article.html#rcng-confdummy
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    [ wei: fix up conflict ]
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    
    (cherry picked from commit 4d362ce02aaf1699957fb7c0edc6ae5839ccb30e)
    (cherry picked from commit 63c68c7ec5b926d218d4d81b96b4352d30a59c7b)
    (cherry picked from commit 675aa124b414d6411f7a661ef638e73e45645b61)
---
 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 cd1f68f..5b85215 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="/var/run/xenconsoled.pid"
 #XENCONSOLED_TRACE="/var/log/xen/xenconsole-trace.log"
 #XENSTORED_TRACE="/var/log/xen/xenstore-trace.log"
 
+load_rc_config $name
+: ${xencommons_enable:=no}
+
 xen_precmd()
 {
        mkdir -p /var/run/xenstored || 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 b3cdc47..da5a703 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_start"
 stop_cmd="xendriverdomain_stop"
 extra_commands=""
 
 XLDEVD_PIDFILE="/var/run/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"
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog