From 839de048afd495acb4ed2d198f86b4368c66d475 Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Fri, 10 Jul 2015 15:22:48 -0400 Subject: [PATCH] (#2208) FreeBSD: call /usr/local/bin/ruby explicitly On FreeBSD systems, the Ruby interpreter is normally installed in /usr/local/bin, which is not on the default PATH when running init scripts. Most users will have it in their PATH when logged in, which causes concat to fail when run from init (or "service puppet start") but not when run from directly the command line ("sudo puppet agent"). This follows the same strategy as OpenBSD, but avoid specifying the Ruby interpreter version explicitly, because FreeBSD supports three different versions of Ruby (with the default always being installed as /usr/local/bin/ruby). --- manifests/setup.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/setup.pp b/manifests/setup.pp index c5aedd82b..6d5d8b2fb 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -44,6 +44,7 @@ $script_command = $::osfamily? { 'windows' => "ruby.exe '${script_path}'", 'openbsd' => "/usr/local/bin/ruby21 '${script_path}'", + 'freebsd' => "/usr/local/bin/ruby '${script_path}'", default => $script_path }