Adding sysctl::laptop

diff --git a/files/etc/modprobe.d/aspire-blacklist-memstick.conf b/files/etc/modprobe.d/aspire-blacklist-memstick.conf
new file mode 100644 (file)
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 (file)
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 9753869e57d815ba8e4f30ed2879b4bbf7a6a137..5b7ecdb9bcf003e9f5a85f58a89ea999a41e9713 100644 (file)
--- 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 cfd6be8525efcf8cff798c27ae774a483b1f52bc..01a2f91a64caf24e1890bf47fcb062bc13267b95 100644 (file)
--- 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 3bd028c784ae37de9387db11d50e6dc72dc19acb..7dfb8751625fb0ac2f9e9bd5b24e31057f98ff80 100644 (file)
--- 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",
+  }
+}