From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 13 Sep 2011 18:59:07 +0000 (-0300)
Subject: Adding fstab for schroot
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=841fac76bbf794729e80699c849a751c22cbd208;p=puppet-nodo.git

Adding fstab for schroot
---

diff --git a/files/etc/schroot/default/fstab b/files/etc/schroot/default/fstab
new file mode 100644
index 0000000..f4d890d
--- /dev/null
+++ b/files/etc/schroot/default/fstab
@@ -0,0 +1,10 @@
+# fstab: 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>
+/proc		/proc		none    rw,rbind        0       0
+/sys		/sys		none    rw,rbind        0       0
+/dev            /dev            none    rw,rbind        0       0
+#/home		/home		none	rw,bind		0	0
+/tmp		/tmp		none	rw,bind		0	0
diff --git a/manifests/subsystems/schroot.pp b/manifests/subsystems/schroot.pp
index acc0361..317fe35 100644
--- a/manifests/subsystems/schroot.pp
+++ b/manifests/subsystems/schroot.pp
@@ -3,8 +3,17 @@ class schroot {
     ensure => installed,
   }
 
+  file { '/etc/schroot/default/fstab':
+    ensure  => $ensure,
+    owner   => root,
+    mode    => 0644,
+    require => Package['schroot'],
+    source  => [ "puppet:///modules/site-nodo/etc/schroot/default/$fqdn/fstab",
+                 "puppet:///modules/nodo/etc/schroot/default/fstab" ]
+  }
+
   define instance($type = 'plain', description, $directory, $users, $groups, $aliases, $ensure = 'present') {
-    file { '/etc/schroot/schroot/chroot.d':
+    file { '/etc/schroot/chroot.d':
       ensure  => $ensure,
       owner   => root,
       mode    => 0644,