From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Dec 2013 09:42:14 +0000 (+0100)
Subject: Add a fstab for freebsd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=db0b73dbe580ebc5453ac23debf18fba9271f758;p=mirror%2Fdsa-puppet.git

Add a fstab for freebsd
---

diff --git a/modules/porterbox/files/schroot-dsa/fstab-freebsd b/modules/porterbox/files/schroot-dsa/fstab-freebsd
new file mode 100644
index 000000000..61fae346a
--- /dev/null
+++ b/modules/porterbox/files/schroot-dsa/fstab-freebsd
@@ -0,0 +1,17 @@
+# 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		linprocfs	defaults	0	0
+dev		/dev		devfs	rw,bind		0	0
+dev		/dev/fd		fdescfs	rw,bind		0	0
+/home		/home		nullfs	rw		0	0
+/tmp		/tmp		nullfs	rw		0	0
+
+# It may be desirable to have access to /run, especially if you wish
+# to run additional services in the chroot.  However, note that this
+# may potentially cause undesirable behaviour on upgrades, such as
+# killing services on the host.
+#/run		/run		nullfs	rw		0	0
+#/run/lock	/run/lock	nullfs	rw		0	0
diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 3747c1295..1e2d83b15 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -12,8 +12,14 @@ class porterbox {
 	file { '/etc/schroot/dsa/config':
 		source  => 'puppet:///modules/porterbox/schroot-dsa/config',
 	}
-	file { '/etc/schroot/dsa/fstab':
-		source  => 'puppet:///modules/porterbox/schroot-dsa/fstab',
+	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		file { '/etc/schroot/dsa/fstab':
+			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab',
+		}
+	} else {
+		file { '/etc/schroot/dsa/fstab':
+			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab-freebsd',
+		}
 	}
 	file { '/etc/schroot/dsa/default-mirror':
 		content => template('porterbox/default-mirror.erb'),