From 78418aaeb7f9f0b74efe1f46fe14d51c97ab9b15 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sat, 5 Feb 2011 14:24:37 +0100 Subject: [PATCH] make mount-defaults conditional and kfreebsd-compatible Signed-off-by: Philipp Kern --- modules/buildd/manifests/init.pp | 2 +- .../etc/schroot/mount-defaults.erb} | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) rename modules/buildd/{files/mount-defaults => templates/etc/schroot/mount-defaults.erb} (65%) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 509d3356..0593e2bf 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -21,7 +21,7 @@ class buildd { notify => Exec["apt-keys-update"], ; "/etc/schroot/mount-defaults": - source => "puppet:///modules/buildd/mount-defaults", + content => template("buildd/etc/schroot/mount-defaults.erb"), require => Package["sbuild"] ; "/etc/cron.d/dsa-buildd": diff --git a/modules/buildd/files/mount-defaults b/modules/buildd/templates/etc/schroot/mount-defaults.erb similarity index 65% rename from modules/buildd/files/mount-defaults rename to modules/buildd/templates/etc/schroot/mount-defaults.erb index f3971e2a..c77a7635 100644 --- a/modules/buildd/files/mount-defaults +++ b/modules/buildd/templates/etc/schroot/mount-defaults.erb @@ -7,6 +7,16 @@ # (CHROOT_PATH) # # +<% if nodeinfo['ldap'].has_key?('architecture') and nodeinfo['ldap']['architecture'].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 +sys /sys linsysfs defaults 0 0 +<% else -%> +# Linux version proc /proc proc defaults 0 0 /dev/pts /dev/pts none rw,bind 0 0 tmpfs /dev/shm tmpfs defaults 0 0 +<% end %> + -- 2.39.2