only include /srv/build-trees in fstab if it exists

diff --git a/modules/debian-org/lib/facter/paths.rb b/modules/debian-org/lib/facter/paths.rb
index 507d1df36cd797398cdc61c3923de5813a08bfc3..6e991f0abf19c986204165859de81fe07069c48e 100644 (file)
--- a/modules/debian-org/lib/facter/paths.rb
+++ b/modules/debian-org/lib/facter/paths.rb
@@ -1,4 +1,4 @@
-Facter.add("has-srv-build-trees") do
+Facter.add("has_srv_build_trees") do
        setcode do
                if FileTest.exist?("/srv/build-trees")
                        true
@@ -7,7 +7,7 @@ Facter.add("has-srv-build-trees") do
                end
        end
 end
-Facter.add("has-srv-buildd") do
+Facter.add("has_srv_buildd") do
        setcode do
                if FileTest.exist?("/srv/buildd")
                        true

diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb
index 5b000d1a296f1d79c37d2f641fdf566bf6874bf5..815e64cfdcf169988f1761e806d471d39d6c198a 100644 (file)
--- a/modules/schroot/templates/schroot-buildd/fstab.erb
+++ b/modules/schroot/templates/schroot-buildd/fstab.erb
@@ -18,5 +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
 
+<%- if has_variable?("has_srv_build_trees") && has-srv-build-trees == "true" -%>
 /srv/build-trees       /build  none    rw,bind         0       0
+
+<% end %>
 <% end %>