diff options
| author | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2019-02-27 15:17:15 +0530 |
|---|---|---|
| committer | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2019-04-11 10:44:40 +0530 |
| commit | a3d7e0c8db3854accff4cbde457ee47e4dd28292 (patch) | |
| tree | 30086740b0e282c6a19f217860a8fd95a1a74ab1 | |
| parent | 0c2be39a02445ae1c0acbe1a22cd6a2c101ba385 (diff) | |
| download | chef-a3d7e0c8db3854accff4cbde457ee47e4dd28292.tar.gz | |
fix service enable idempotency in sles11
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
| -rw-r--r-- | lib/chef/provider/service/insserv.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/service/insserv_service_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/provider/service/insserv.rb b/lib/chef/provider/service/insserv.rb index a8e841f8b3..a37b839b5d 100644 --- a/lib/chef/provider/service/insserv.rb +++ b/lib/chef/provider/service/insserv.rb @@ -36,7 +36,7 @@ class Chef super # Look for a /etc/rc.*/SnnSERVICE link to signify that the service would be started in a runlevel - if Dir.glob("/etc/rc**/S*#{Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)}").empty? + if Dir.glob("/etc/rc.d/rc**/S*#{Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)}").empty? current_resource.enabled false else current_resource.enabled true diff --git a/spec/unit/provider/service/insserv_service_spec.rb b/spec/unit/provider/service/insserv_service_spec.rb index f2fe19db59..ec81540440 100644 --- a/spec/unit/provider/service/insserv_service_spec.rb +++ b/spec/unit/provider/service/insserv_service_spec.rb @@ -36,7 +36,7 @@ describe Chef::Provider::Service::Insserv do describe "load_current_resource" do describe "when startup links exist" do before do - allow(Dir).to receive(:glob).with("/etc/rc**/S*initgrediant").and_return(["/etc/rc5.d/S18initgrediant", "/etc/rc2.d/S18initgrediant", "/etc/rc4.d/S18initgrediant", "/etc/rc3.d/S18initgrediant"]) + allow(Dir).to receive(:glob).with("/etc/rc.d/rc**/S*initgrediant").and_return(["/etc/rc5.d/S18initgrediant", "/etc/rc2.d/S18initgrediant", "/etc/rc4.d/S18initgrediant", "/etc/rc3.d/S18initgrediant"]) end it "sets the current enabled status to true" do @@ -47,7 +47,7 @@ describe Chef::Provider::Service::Insserv do describe "when startup links do not exist" do before do - allow(Dir).to receive(:glob).with("/etc/rc**/S*initgrediant").and_return([]) + allow(Dir).to receive(:glob).with("/etc/rc.d/rc**/S*initgrediant").and_return([]) end it "sets the current enabled status to false" do |