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

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

diff --git a/cookbooks/sysfs/recipes/default.rb b/cookbooks/sysfs/recipes/default.rb
index fa7983d626b96d22df7db04d78c7e4abb1aa012c..6e2dac1f5ba0dcf011bcaaa03861865fa0da1e01 100644 (file)
--- a/cookbooks/sysfs/recipes/default.rb
+++ b/cookbooks/sysfs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: sysfs
+# Cookbook:: sysfs
 # Recipe:: default
 #
-# Copyright 2013, Tom Hughes
+# Copyright:: 2013, Tom Hughes
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,29 +17,36 @@
 # limitations under the License.
 #
 
-package "sysfsutils"
+if node[:virtualization][:role] == "guest" &&
+   node[:virtualization][:system] == "lxd"
+  package "sysfsutils" do
+    action :purge
+  end
+else
+  package "sysfsutils"
 
-service "sysfsutils" do
-  action :enable
-  supports :status => false, :restart => true, :reload => false
-end
+  service "sysfsutils" do
+    action :enable
+    supports :status => false, :restart => true, :reload => false
+  end
 
-template "/etc/sysfs.conf" do
-  source "sysfs.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :restart, "service[sysfsutils]"
-end
+  template "/etc/sysfs.d/99-chef.conf" do
+    source "sysfs.conf.erb"
+    owner "root"
+    group "root"
+    mode "644"
+    notifies :restart, "service[sysfsutils]"
+  end
 
-node[:sysfs].each_value do |group|
-  group[:parameters].each do |key, value|
-    sysfs_file = "/sys/#{key}"
+  node[:sysfs].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysfs_file = "/sys/#{key}"
 
-    file sysfs_file do
-      content "#{value}\n"
-      atomic_update false
-      only_if { File.exist?(sysfs_file) }
+      file sysfs_file do
+        content "#{value}\n"
+        atomic_update false
+        ignore_failure true
+      end
     end
   end
 end