From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 18 Feb 2011 16:17:29 +0000 (-0200)
Subject: Modprobe config for squeeze
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d27a46c2847dc7e56a34f91fe92b40b6b389a878;p=puppet-nodo.git

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 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",
+      }
+    }
   }
 }