Merge pull request #333 from redBorder/development

Development

Author: manegron

VERSION

@@ -1 +1 @@
-6.22.0
+6.22.1

resources/scripts/rb_init_conf.rb

@@ -14,13 +14,18 @@
 require 'system/getifaddrs'
 require 'json'
 require 'open3'
+require 'getopt/std'
 require File.join(ENV['RBLIB'].nil? ? '/usr/lib/redborder/lib' : ENV['RBLIB'],'rb_config_utils.rb')
 
 RBETC = ENV['RBETC'].nil? ? '/etc/redborder' : ENV['RBETC']
 INITCONF="#{RBETC}/rb_init_conf.yml"
 
 init_conf = YAML.load_file(INITCONF)
 
+# Parse command-line options
+opts = Getopt::Std.getopts("s")
+opt["s"] ? rb_bootstrap_service = true : rb_bootstrap_service = false
+
 def iproute2_version
   stdout, _stderr, _status = Open3.capture3('rpm -q iproute')
   version_match = stdout.match(/iproute-(\d+\.\d+\.\d+)/)
@@ -284,4 +289,8 @@ def use_usr_share?(version)
 system('systemctl start serf &> /dev/null')
 # wait a moment before start serf-join to ensure connectivity
 sleep(3)
-system('/usr/lib/redborder/bin/rb_bootstrap.sh')
+if rb_bootstrap_service
+  system('systemctl start rb-bootstrap &> /dev/null')
+else
+  system('/usr/lib/redborder/bin/rb_bootstrap.sh')
+end