X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ftemplates%2Fschroot-buildd%2Ffstab.erb;h=2ff619834ff1b10b98fab12f82e55d7383e9351a;hb=641b06da386fa4d8f9d992fdcc88470c63bb8835;hp=815e64cfdcf169988f1761e806d471d39d6c198a;hpb=ea3a5fb80c7d8a582f150921b9f7247e01c5e27d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb
index 815e64cfd..2ff619834 100644
--- a/modules/schroot/templates/schroot-buildd/fstab.erb
+++ b/modules/schroot/templates/schroot-buildd/fstab.erb
@@ -4,22 +4,12 @@
 #
 # <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
-
-/srv/build-trees	/build	nullfs	rw		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
 
-<%- if has_variable?("has_srv_build_trees") && has-srv-build-trees == "true" -%>
+<%- if has_variable?("has_srv_build_trees") && @has_srv_build_trees -%>
 /srv/build-trees	/build	none	rw,bind		0	0
-
-<% end %>
 <% end %>