projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only include /srv/build-trees in fstab if it exists
[mirror/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
eec5fdf
..
815e64c
100644
(file)
--- a/
modules/schroot/templates/schroot-buildd/fstab.erb
+++ b/
modules/schroot/templates/schroot-buildd/fstab.erb
@@
-10,6
+10,7
@@
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,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
<% 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
/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
/srv/build-trees /build none rw,bind 0 0
+
+<% end %>
+<% end %>