Merge remote-tracking branch 'github/pull/440'

[chef.git] / cookbooks / devices / recipes / default.rb

diff --git a/cookbooks/devices/recipes/default.rb b/cookbooks/devices/recipes/default.rb
index 73c1a4e9a94df14488a0be766e48acace04c02d6..8572dd232755abde2ca33c1187deb69d98b14f6a 100644 (file)
--- a/cookbooks/devices/recipes/default.rb
+++ b/cookbooks/devices/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: devices
+# Cookbook:: devices

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,15 +17,21 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+cookbook_file "/usr/local/bin/fixeep-82574_83.sh" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+

 execute "udevadm-trigger" do
   action :nothing
 execute "udevadm-trigger" do
   action :nothing

-  command "/sbin/udevadm trigger --action=add"
+  command "/bin/udevadm trigger --action=add"

 end
 
 template "/etc/udev/rules.d/99-chef.rules" do
   source "udev.rules.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/udev/rules.d/99-chef.rules" do
   source "udev.rules.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :run, resources(:execute => "udevadm-trigger")
+  mode "644"
+  notifies :run, "execute[udevadm-trigger]"

 end
 end