aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgustin Henze <tin@sluc.org.ar>2013-02-14 18:53:23 -0300
committerJunichi Uekawa <dancer@netfort.gr.jp>2013-02-28 07:09:13 +0900
commit9fea2eddf4841b35c78e01adc6a4eddbc4109db8 (patch)
tree229154d5eeb15c3ca7e74004552cbfd42bfc8b23
parentdea054ac1c5a270e2042bb6403fbc774c301a91f (diff)
downloadpbuilder-9fea2eddf4841b35c78e01adc6a4eddbc4109db8.tar
pbuilder-9fea2eddf4841b35c78e01adc6a4eddbc4109db8.tar.gz
Added support for shared memory mounting point (closes: #700591)
-rw-r--r--pbuilder-modules11
-rw-r--r--pbuilderrc1
2 files changed, 12 insertions, 0 deletions
diff --git a/pbuilder-modules b/pbuilder-modules
index c98fe04..3756615 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -221,6 +221,9 @@ function umountproc () {
if [ "$USEDEVFS" = "yes" ]; then
umount_one "dev"
fi
+ if [ "$USEDEVSHM" = "yes" ]; then
+ umount_one "$SHM_PATH"
+ fi
if [ "$USEPROC" = "yes" ]; then
if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ -e $BUILDPLACE/proc/sys/fs/binfmt_misc/status ]; then
umount_one "proc/sys/fs/binfmt_misc"
@@ -253,6 +256,14 @@ function mountproc () {
mount -t devfs /dev "$BUILDPLACE/dev"
mounted[${#mounted[@]}]="$BUILDPLACE/dev"
fi
+ if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVSHM" = "yes" ]; then
+ SHM_PATH="run/shm"
+ [ ! -d "/$SHM_PATH" ] && SHM_PATH="dev/shm"
+ log "I: mounting /$SHM_PATH filesystem"
+ mkdir -p $BUILDPLACE/$SHM_PATH || true
+ mount -t tmpfs tmpfs "$BUILDPLACE/$SHM_PATH"
+ mounted[${#mounted[@]}]="$BUILDPLACE/$SHM_PATH"
+ fi
if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then
log "I: mounting /dev/pts filesystem"
mkdir -p $BUILDPLACE/dev/pts || true
diff --git a/pbuilderrc b/pbuilderrc
index 8462728..0c1bd4b 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -10,6 +10,7 @@ MIRRORSITE=http://cdn.debian.net/debian
#export http_proxy=http://your-proxy:8080/
USEPROC=yes
USEDEVPTS=yes
+USEDEVSHM=yes
USEDEVFS=no
BUILDRESULT=/var/cache/pbuilder/result/