From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 12 Jul 2014 10:35:29 +0000 (+0200)
Subject: Deploy /etc/schroot/buildd/fstab via puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4821ac4dee638a886249ef48880523a9e77e3a80;p=mirror%2Fdsa-puppet.git

Deploy /etc/schroot/buildd/fstab via puppet
---

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 731fd5b53..5c0f36016 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -48,4 +48,9 @@ class schroot {
 		content => template('schroot/schroot-dsa/fstab.erb'),
 		require => Package['schroot'],
 	}
+
+	file { '/etc/schroot/buildd/fstab':
+		content => template('schroot/schroot-buildd/fstab.erb'),
+		require => Package['schroot'],
+	}
 }
diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb
new file mode 100644
index 000000000..eec5fdf02
--- /dev/null
+++ b/modules/schroot/templates/schroot-buildd/fstab.erb
@@ -0,0 +1,22 @@
+# 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>
+
+<% 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
+
+<% else -%>
+# Linux version
+/proc		/proc		none	rw,bind		0	0
+/sys		/sys		none	rw,bind		0	0
+/dev/pts	/dev/pts	none	rw,bind		0	0
+tmpfs-shm	/dev/shm	tmpfs	defaults,size=64m	0 0
+
+<% end %>
+
+/srv/build-trees	/build	none	rw,bind		0	0