From: Stephen Gran <steve@lobefin.net>
Date: Sat, 6 Jun 2009 20:29:45 +0000 (+0100)
Subject: Add default fstab for buildds per pkern
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=29391766483f14c896ba705c9fe657bc88c8d76e;hp=efd1e90abcfffc0753584dd0b3c4e6860df18045;p=mirror%2Fdsa-puppet.git

Add default fstab for buildds per pkern
https://rt.debian.org/Ticket/Display.html?id=1456
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/buildd/files/mount-defaults b/modules/buildd/files/mount-defaults
new file mode 100644
index 000000000..f3971e2a1
--- /dev/null
+++ b/modules/buildd/files/mount-defaults
@@ -0,0 +1,12 @@
+##
+## 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>
+proc            /proc           proc    defaults        0       0
+/dev/pts        /dev/pts        none    rw,bind         0       0
+tmpfs           /dev/shm        tmpfs   defaults        0       0
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 1d711b9fa..7977b11ad 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -14,10 +14,14 @@ class buildd {
              notify  => Exec["apt-get update"],
              ;
 
-        "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
-          source  => "puppet:///buildd/buildd.debian.org.asc",
-          mode    => 664,
-          notify  => Exec["apt-keys-update"],
-          ;
+      "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
+            source  => "puppet:///buildd/buildd.debian.org.asc",
+            mode    => 664,
+            notify  => Exec["apt-keys-update"],
+            ;
+      "/etc/schroot/mount-defaults":
+            source  => "puppet:///buildd/mount-defaults",
+            require => Package["sbuild"]
+            ;
    }
 }