remove ,bind from schroot fstab on freebsd

[dsa-puppet.git] / modules / schroot / templates / schroot-buildd / fstab.erb

diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb
index eec5fdf024ee445117d23601d845b3a180c58e89..56a87563e1cd497dfe3b467a1ef8b046eb5f6f49 100644 (file)
--- a/modules/schroot/templates/schroot-buildd/fstab.erb
+++ b/modules/schroot/templates/schroot-buildd/fstab.erb
@@ -7,9 +7,10 @@
 <% 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
+dev            /dev            devfs   rw              0       0
+dev            /dev/fd         fdescfs rw              0       0
 
+/srv/build-trees       /build  nullfs  rw              0       0
 <% else -%>
 # Linux version
 /proc          /proc           none    rw,bind         0       0
@@ -17,6 +18,8 @@ dev           /dev/fd         fdescfs rw,bind         0       0
 /dev/pts       /dev/pts        none    rw,bind         0       0
 tmpfs-shm      /dev/shm        tmpfs   defaults,size=64m       0 0
 
-<% end %>
-
+<%- if has_variable?("has_srv_build_trees") && has_srv_build_trees == "true" -%>
 /srv/build-trees       /build  none    rw,bind         0       0
+
+<% end %>
+<% end %>