From 651357a333f7d820ea46862771d617fe8dd22717 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 9 Dec 2013 19:24:29 +0100 Subject: [PATCH] Ship our own fstab for the dsa schroot profile --- modules/porterbox/files/schroot-dsa/fstab | 21 +++++++++++++++++++++ modules/porterbox/manifests/init.pp | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 modules/porterbox/files/schroot-dsa/fstab diff --git a/modules/porterbox/files/schroot-dsa/fstab b/modules/porterbox/files/schroot-dsa/fstab new file mode 100644 index 000000000..d199237cd --- /dev/null +++ b/modules/porterbox/files/schroot-dsa/fstab @@ -0,0 +1,21 @@ +# fstab: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# +/proc /proc none rw,bind 0 0 +/sys /sys none rw,bind 0 0 +/dev /dev none rw,bind 0 0 +/dev/pts /dev/pts none rw,bind 0 0 +/home /home none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +tmpfs-shm /dev/shm tmpfs defaults,size=64m 0 0 + +# It may be desirable to have access to /run, especially if you wish +# to run additional services in the chroot. However, note that this +# may potentially cause undesirable behaviour on upgrades, such as +# killing services on the host. +#/run /run none rw,bind 0 0 +#/run/lock /run/lock none rw,bind 0 0 +#/dev/shm /dev/shm none rw,bind 0 0 +#/run/shm /run/shm none rw,bind 0 0 diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp index 03bd65cf6..3747c1295 100644 --- a/modules/porterbox/manifests/init.pp +++ b/modules/porterbox/manifests/init.pp @@ -12,6 +12,9 @@ class porterbox { file { '/etc/schroot/dsa/config': source => 'puppet:///modules/porterbox/schroot-dsa/config', } + file { '/etc/schroot/dsa/fstab': + source => 'puppet:///modules/porterbox/schroot-dsa/fstab', + } file { '/etc/schroot/dsa/default-mirror': content => template('porterbox/default-mirror.erb'), } -- 2.20.1