X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=blobdiff_plain;f=modules%2Fschroot%2Ftemplates%2Fschroot-buildd%2Ffstab.erb;h=2ff619834ff1b10b98fab12f82e55d7383e9351a;hp=7fe230f9d342efa4ccb26b5b48dee39ebe7882c1;hb=0808e7cdefd89761bee793e373d391ea076ff3de;hpb=ade9637f7f6c3fb062aba1c5abe4c1dfe4360b45 diff --git a/modules/schroot/templates/schroot-buildd/fstab.erb b/modules/schroot/templates/schroot-buildd/fstab.erb index 7fe230f9d..2ff619834 100644 --- a/modules/schroot/templates/schroot-buildd/fstab.erb +++ b/modules/schroot/templates/schroot-buildd/fstab.erb @@ -4,14 +4,6 @@ # # -<% 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 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 /sys /sys none rw,bind 0 0 @@ -20,6 +12,4 @@ tmpfs-shm /dev/shm tmpfs defaults,size=64m 0 0 <%- if has_variable?("has_srv_build_trees") && @has_srv_build_trees -%> /srv/build-trees /build none rw,bind 0 0 - -<% end %> <% end %>