aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-07-20 11:36:06 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-20 11:36:06 -0300
commita92e49bbe972fde4214d8c68dd2f75a02accaff2 (patch)
tree61cd605aa1d2410d9122c0ecd0aa9c6c2ecbccfb
parent2621e23b5bcfef8c9c5f23cd670c22ce3c112aa3 (diff)
parent062177acba435816d6d8e3450e141b058d17baa0 (diff)
downloadpuppet-nodo-a92e49bbe972fde4214d8c68dd2f75a02accaff2.tar.gz
puppet-nodo-a92e49bbe972fde4214d8c68dd2f75a02accaff2.tar.bz2
Merge branch 'master' into develop
-rw-r--r--files/etc/rc.local2
-rw-r--r--manifests/utils/multimedia/ripper.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/files/etc/rc.local b/files/etc/rc.local
index 55fdcd9..124623d 100644
--- a/files/etc/rc.local
+++ b/files/etc/rc.local
@@ -45,7 +45,7 @@ if [ -e "/sys/module/usbcore/parameters/authorized_default" ]; then
echo "0" > /sys/module/usbcore/parameters/authorized_default
for bus in /sys/bus/usb/devices/usb*; do
- echo 0 > $bus/authorized_default
+ echo "0" > "$bus/authorized_default"
done
fi
diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp
index 4d1f4d2..9fcd12f 100644
--- a/manifests/utils/multimedia/ripper.pp
+++ b/manifests/utils/multimedia/ripper.pp
@@ -1,6 +1,6 @@
class nodo::utils::multimedia::ripper {
# CD writers and extractors
- package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject' ]:
+ package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject', 'cdrdao' ]:
ensure => installed,
}
}