diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-07 09:20:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-07 09:23:01 +0000 |
| commit | dd56b238471f896a71aaace51b4c4b693365294b (patch) | |
| tree | 43726197b0d1f1e393c0ad0d96ca1a6513c4e049 | |
| parent | ea1d63c16436bc12ca8cdff807a8a6510f180f6e (diff) | |
| download | aports-dd56b238471f896a71aaace51b4c4b693365294b.tar.bz2 aports-dd56b238471f896a71aaace51b4c4b693365294b.tar.xz | |
main/lxc: fix /dev/shm in alpine template
fixes #2745
| -rw-r--r-- | main/lxc/0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch | 29 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 6 |
2 files changed, 34 insertions, 1 deletions
diff --git a/main/lxc/0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch b/main/lxc/0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch new file mode 100644 index 0000000000..3908004bc0 --- /dev/null +++ b/main/lxc/0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch @@ -0,0 +1,29 @@ +From 1bdedfacc260545b77e2da557850ba420a0fb12c Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Tue, 28 Jan 2014 19:03:27 +0200 +Subject: [PATCH] lxc-alpine: mount tmpfs on /dev/shm +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Acked-by: Stéphane Graber <stgraber@ubuntu.com> +--- + templates/lxc-alpine.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in +index 50a6a71..40957ab 100644 +--- a/templates/lxc-alpine.in ++++ b/templates/lxc-alpine.in +@@ -227,6 +227,7 @@ lxc.cgroup.devices.allow = c 254:0 rm + lxc.mount.entry=proc proc proc nodev,noexec,nosuid 0 0 + lxc.mount.entry=run run tmpfs nodev,noexec,nosuid,relatime,size=1m,mode=0755 0 0 + lxc.mount.entry=none dev/pts devpts gid=5,mode=620 0 0 ++lxc.mount.entry=shm dev/shm tmpfs nodev,nosuid,noexec 0 0 + + EOF + +-- +1.9.0 + diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index ed0b64c4a5..c7abe0a5d3 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=6 +pkgrel=7 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -25,6 +25,7 @@ source="http://linuxcontainers.org/downloads/lxc-$_mypkgver.tar.gz 0001-lxc-alpine-enable-4-consoles-by-default.patch 0001-lxc-alpine-enable-loopback-interface-by-default.patch 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch + 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch lxc-fix-headers.patch lxc.initd @@ -74,6 +75,7 @@ ee3339a1c5d388b65b24bdea924387a8 0001-lxc-alpine-allow-dev-full.patch c12ea194274b6c8d3b05bd43ed70c61d 0001-lxc-alpine-enable-4-consoles-by-default.patch 999a89373f5e2c61d1369526de7e5850 0001-lxc-alpine-enable-loopback-interface-by-default.patch 75979789ec45ef865895f5ce5721dd3e 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +9dd77bd91171287e1cbab2662a129a44 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch 9f780f761dcaec3ce40d083c6df044d4 lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz @@ -87,6 +89,7 @@ df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b alpine-templat 264cbc4efe6983050b3043fb4df031c4d9b93d35eb3c02463bddf530f8701880 0001-lxc-alpine-enable-4-consoles-by-default.patch eb5043672ef81cd5b20f25dc847bfad7e9e14b42a794856c3a8c8c1e4e408dfc 0001-lxc-alpine-enable-loopback-interface-by-default.patch 51bd2fc5f166499c8996d1b89f324168b0c1bbb6b2b79260591d442120098a34 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +9bb8fd6176cecfd35faf1fb4ba2c3c10d11338064f795b04061029ae38550cea 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch 8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz @@ -100,5 +103,6 @@ dd686d8ce9cd73807b744163e6b20e41eca17f3ee618cef66f19488cb2527b56d38c04231d25177d 372490dc5a459778e97b75691ed48b2c070c0a9b16f08c7f5ef3a791ded64fe5f23ca1e145314fea355664a2b055eb572546dd0793560137baae0898184c9e19 0001-lxc-alpine-enable-4-consoles-by-default.patch 47d31ed9d0cdde58b0ee97b3f179db270534b73fe8c77fe72fdef1483a545e608a533d41e8b4041474493016cd445fe02751663ad0cbc7fc9af241b344454dea 0001-lxc-alpine-enable-loopback-interface-by-default.patch 75130578c4103586b973c6e9586833acfa89de8021f4dd320385905c4f9d3d1bf7a1e8d3cfe8704a3add00d41d19c30a371bce232a863e9c837a148e9066a0d6 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch +bdb03020f4eb2f7815f7783c071c144f3b9f7976717e5b14e75e720f13348a751ea6b1a29ab14c6278ca41f4f911b3640252e58ae0d7ffe2cc97e9ce143b394a 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" |