Merge pull request #55 from chef/svdir-set

Explicitly set SVDIR to the service_dir
chef · Mar 28, 2017 · 43b1041 · 43b1041
2 parents 5a80ace + d8f3806
commit 43b1041
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/omnibus-ctl.rb b/lib/omnibus-ctl.rb
@@ -58,8 +58,10 @@ def initialize(name, merge_service_commands=true, disp_name = nil)
       @force_exit = false
       @global_pre_hooks = {}
 
-      # Remove SVDIR if it is set
-      ENV.delete('SVDIR')
+      # TODO(ssd) 2017-03-28: Set SVDIR explicitly. Once we fix a bug
+      # in our debian support, where we rely on system-installed
+      # runit, we can likely change this back to ENV.delete("SVDIR")
+      ENV['SVDIR'] = service_path
 
       # backwards compat command map that does not have categories
       @command_map = { }