aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems/firewire.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystems/firewire.pp')
-rw-r--r--manifests/subsystems/firewire.pp12
1 files changed, 2 insertions, 10 deletions
diff --git a/manifests/subsystems/firewire.pp b/manifests/subsystems/firewire.pp
index 1c9609a..088e194 100644
--- a/manifests/subsystems/firewire.pp
+++ b/manifests/subsystems/firewire.pp
@@ -1,15 +1,7 @@
class firewire {
- # keep firewire disabled
- # see http://padrao.sarava.org/trac/wiki/Debian/Firewire
- file { "/etc/modprobe.d/blacklist":
- owner => "root",
- group => "root",
- mode => 0644,
- ensure => present,
- source => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist",
- }
-
# make sure ohci1394 is not loaded
+ # see http://padrao.sarava.org/trac/wiki/Debian/Firewire
+ # see also the modprobe class
exec { "rmmod ohci1394":
unless => "/bin/sh -c 'if `grep -q ^ohci1394 /proc/modules`; then false; else true; fi'",
user => "root",