aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/etc/modprobe.d/blacklist.conf (renamed from files/etc/modprobe.d/blacklist)0
-rw-r--r--manifests/subsystems/modprobe.pp30
2 files changed, 24 insertions, 6 deletions
diff --git a/files/etc/modprobe.d/blacklist b/files/etc/modprobe.d/blacklist.conf
index 9d64fdc..9d64fdc 100644
--- a/files/etc/modprobe.d/blacklist
+++ b/files/etc/modprobe.d/blacklist.conf
diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
index 01a2f91..45870af 100644
--- a/manifests/subsystems/modprobe.pp
+++ b/manifests/subsystems/modprobe.pp
@@ -1,11 +1,29 @@
class modprobe {
# keep firewire disabled among other things
- file { "/etc/modprobe.d/blacklist":
- owner => "root",
- group => "root",
- mode => 0644,
- ensure => present,
- source => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist",
+ case $lsbdistcodename ? {
+ 'lenny': {
+ file { "/etc/modprobe.d/blacklist":
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ source => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist.conf",
+ }
+ }
+ default: {
+ # upgrade from lenny
+ file { "/etc/modprobe.d/blacklist":
+ ensure => absent,
+ }
+
+ file { "/etc/modprobe.d/blacklist.conf":
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ source => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist.conf",
+ }
+ }
}
}