From 466e1e24308653c714e81454a638695109f4c063 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 12 Jul 2014 12:32:16 +0200 Subject: [PATCH] Remove /etc/schroot/mount-defaults --- modules/schroot/manifests/init.pp | 3 +-- modules/schroot/templates/mount-defaults.erb | 22 -------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 modules/schroot/templates/mount-defaults.erb diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp index 2e22db30..731fd5b5 100644 --- 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 index 9dc2d518..00000000 --- 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) -# -# -<% 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 %> - -- 2.39.2