Removing modprobe::laptop class

diff --git a/files/etc/modprobe.d/aspire-blacklist-memstick.conf b/files/etc/modprobe.d/aspire-blacklist-memstick.conf
deleted file mode 100644 (file)
index 4f7fd29..0000000
--- a/files/etc/modprobe.d/aspire-blacklist-memstick.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-blacklist jmb38x_ms
-blacklist memstick

diff --git a/files/etc/modules/laptop b/files/etc/modules/laptop
deleted file mode 100644 (file)
index d8894c3..0000000
--- a/files/etc/modules/laptop
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/modules: kernel modules to load at boot time.
-#
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-# Parameters can be specified after the module name.
-

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index c59a9b7c82eaf7bc411f05646dfd2cd7dd2433d5..f40da8b7090f42b780073885d5d5b90725e12a91 100644 (file)
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -1,6 +1,5 @@
 class nodo::laptop inherits nodo::personal {
   include utils::laptop
-  include modprobe::laptop
   include firewall::wifi
   include firewall::openvpn
   include firewall::ppp

diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
index 2b75225c813a2b8ca4245b25689999f20e07b366..99f7879581b96c8b43d11d9784a1a89e5dc6e5a2 100644 (file)
--- a/manifests/subsystems/modprobe.pp
+++ b/manifests/subsystems/modprobe.pp
@@ -26,22 +26,3 @@ class modprobe {
     }
   }
 }
-
-class modprobe::laptop {
-  file { "/etc/modules":
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    source  => "puppet:///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:///modules/nodo/etc/modprobe.d/aspire-blacklist-memstick.conf",
-  }
-}