Remove /etc/schroot/mount-defaults

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 2e22db30fa774752b1b1d99d5299e7acc02e2ae8..731fd5b533d46cb38d5d1be5490dcdba1aa28585 100644 (file)
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -16,8 +16,7 @@ class schroot {
        }
 
        file { '/etc/schroot/mount-defaults':
-               content => template('schroot/mount-defaults.erb'),
-               require => Package['schroot'],
+               ensure => absent,
        }
        file { '/etc/schroot/default/nssdatabases':
                source  => 'puppet:///modules/schroot/nssdatabases',

diff --git a/modules/schroot/templates/mount-defaults.erb b/modules/schroot/templates/mount-defaults.erb
deleted file mode 100644 (file)
index 9dc2d51..0000000
--- a/modules/schroot/templates/mount-defaults.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system> <mount point>   <type>  <options>       <dump>  <pass>
-<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%>
-# kFreeBSD version
-proc           /proc           linprocfs       defaults        0       0
-dev            /dev            devfs   rw,bind         0       0
-dev            /dev/fd         fdescfs rw,bind         0       0
-sys            /sys            linsysfs        defaults        0       0
-<% else -%>
-# Linux version
-proc            /proc           proc    defaults        0       0
-/dev/pts        /dev/pts        none    rw,bind         0       0
-tmpfs           /dev/shm        tmpfs   defaults        0       0
-<% end %>
-