diff options
| -rw-r--r-- | files/etc/modprobe.d/aspire-blacklist-memstick.conf | 2 | ||||
| -rw-r--r-- | files/etc/modules/laptop | 6 | ||||
| -rw-r--r-- | manifests/laptop.pp | 1 | ||||
| -rw-r--r-- | manifests/subsystems/modprobe.pp | 19 |
4 files changed, 0 insertions, 28 deletions
diff --git a/files/etc/modprobe.d/aspire-blacklist-memstick.conf b/files/etc/modprobe.d/aspire-blacklist-memstick.conf deleted file mode 100644 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 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 c59a9b7..f40da8b 100644 --- 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 2b75225..99f7879 100644 --- 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", - } -} |