aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-04-11 17:15:20 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-04-11 17:15:20 -0300
commit540bc4c391680c0acb5232e1d830bb9b13eabc55 (patch)
tree7a84b055be7d6d33960339154e7400762884550a
parentaf9cca69e3dd50c12a415f86be99eef41e19fbc7 (diff)
downloadpuppet-nodo-540bc4c391680c0acb5232e1d830bb9b13eabc55.tar.gz
puppet-nodo-540bc4c391680c0acb5232e1d830bb9b13eabc55.tar.bz2
Adding sysctl::laptop
-rw-r--r--files/etc/modprobe.d/aspire-blacklist-memstick.conf2
-rw-r--r--files/etc/sysctl.d/madwifi.conf2
-rw-r--r--manifests/laptop.pp1
-rw-r--r--manifests/subsystems/modprobe.pp9
-rw-r--r--manifests/subsystems/sysctl.pp10
5 files changed, 24 insertions, 0 deletions
diff --git a/files/etc/modprobe.d/aspire-blacklist-memstick.conf b/files/etc/modprobe.d/aspire-blacklist-memstick.conf
new file mode 100644
index 0000000..4f7fd29
--- /dev/null
+++ b/files/etc/modprobe.d/aspire-blacklist-memstick.conf
@@ -0,0 +1,2 @@
+blacklist jmb38x_ms
+blacklist memstick
diff --git a/files/etc/sysctl.d/madwifi.conf b/files/etc/sysctl.d/madwifi.conf
new file mode 100644
index 0000000..5483318
--- /dev/null
+++ b/files/etc/sysctl.d/madwifi.conf
@@ -0,0 +1,2 @@
+dev.wifi0.ledpin=3
+dev.wifi0.softled=1
diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index 9753869..5b7ecdb 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -1,6 +1,7 @@
class nodo::laptop inherits nodo::personal {
include utils::laptop
include modprobe::laptop
+ include sysctl::laptop
# fstab
file { "/etc/fstab":
diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
index cfd6be8..01a2f91 100644
--- a/manifests/subsystems/modprobe.pp
+++ b/manifests/subsystems/modprobe.pp
@@ -17,4 +17,13 @@ class modprobe::laptop {
ensure => present,
source => "puppet://$server/modules/nodo/etc/modules/laptop",
}
+
+ # see http://wiki.debian.org/DebianAcerOne#Cardreader
+ file { "/etc/modprobe.d/aspire-blacklist-memstick.conf":
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ source => "puppet://$server/modules/nodo/etc/modprobe.d/aspire-blacklist-memstick.conf",
+ }
}
diff --git a/manifests/subsystems/sysctl.pp b/manifests/subsystems/sysctl.pp
index 3bd028c..7dfb875 100644
--- a/manifests/subsystems/sysctl.pp
+++ b/manifests/subsystems/sysctl.pp
@@ -14,3 +14,13 @@ class sysctl {
refreshonly => true,
}
}
+
+class sysctl::laptop {
+ file { "/etc/sysctl.d/madwifi.conf":
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ source => "puppet://$server/modules/nodo/etc/sysctl.d/madwifi.conf",
+ }
+}