Modprobe config for squeeze

diff --git a/files/etc/modprobe.d/blacklist b/files/etc/modprobe.d/blacklist.conf
similarity index 100%
rename from files/etc/modprobe.d/blacklist
rename to files/etc/modprobe.d/blacklist.conf

diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
index 01a2f91a64caf24e1890bf47fcb062bc13267b95..45870aff20c12379996096f449dcfc5f65ef1614 100644 (file)
--- 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",
+      }
+    }
   }
 }