diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-10-12 13:39:01 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-10-12 13:40:00 +0200 |
| commit | d04973116c4f564aa39b679accea382f24165a6d (patch) | |
| tree | af98fcb9c8ce9b9e83ab4ba846a2fe5851d1ca80 | |
| parent | e82e3ff92bc652b86c1fd5c7ae8ba92e34c88740 (diff) | |
| download | aports-d04973116c4f564aa39b679accea382f24165a6d.tar.bz2 aports-d04973116c4f564aa39b679accea382f24165a6d.tar.xz | |
main/lxc: mount /dev/shm as tmpfs in the alpine template
| -rw-r--r-- | main/lxc/APKBUILD | 12 | ||||
| -rw-r--r-- | main/lxc/alpine-template-mount-shm.patch | 24 |
2 files changed, 32 insertions, 4 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 7b681ee34c..aadf33f93a 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -5,7 +5,7 @@ pkgname=lxc pkgver=2.0.4 _pkgver=${pkgver/_rc/.rc} -pkgrel=1 +pkgrel=2 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -24,6 +24,7 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz download-template-tmpfs.patch add_more_archs.patch + alpine-template-mount-shm.patch " builddir="$srcdir/lxc-lxc-$_pkgver" @@ -116,16 +117,19 @@ md5sums="d6140f9a02420bd944f548899550bdfa lxc-2.0.4.tar.gz 8ffde5bd9bfec77d14a8013c780074ca lxc.initd 032d70c80d3380353223776a5bfe4014 lxc.conf e8fd932f3ec6d52d7b4c183fc58c0b24 download-template-tmpfs.patch -64baa87f8fad40667e634b81412f3830 add_more_archs.patch" +64baa87f8fad40667e634b81412f3830 add_more_archs.patch +214082ef88454f810ace045a04f8a041 alpine-template-mount-shm.patch" sha256sums="57d40234aeecf5b60fb29d563e5a09d6a04c89e1267eb22a6704388ac8573e7b lxc-2.0.4.tar.gz b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch dc39d869a2a690f7dcc9186c2707ed6c7ae2cd5248a9c062f3cb0ce4de73295b lxc.initd 06c02a9d21c5160a00c0a92fac222850b97c04f830307692007f264d9344c474 lxc.conf 8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1 download-template-tmpfs.patch -872e93155834e1ccf8861458aefc9765142da95bb09b05172dd3ebc4a755e038 add_more_archs.patch" +872e93155834e1ccf8861458aefc9765142da95bb09b05172dd3ebc4a755e038 add_more_archs.patch +3376e2facb877615908745c960626249888c10826c8086fc04ac3ee168772309 alpine-template-mount-shm.patch" sha512sums="3f985bba5aaa8a70f0329316ea4f42ab135d58c47611154c62e103718212a4b2c5e4f25fd45c372424db1fbf40afdc8269ae98655fb3bc8e31085a5d948f702b lxc-2.0.4.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch 82c8cdae3cf39a00205bb38a87561ba5b603c046c2438bfd897fc5ee4a2d1d5fde0431cb471f51b2e92cb76f795832ea9cb2f7494e4d67e7131aae2a6d6c29b2 lxc.initd 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch -6c9cbb7dc39a95e2eaa1000e11f445425b0a2b70d3bcb646a6781c7c7ec089d06e3a81259f9edf0a781cb9cb92059a9c883164c1e1c748949a122267cab2d811 add_more_archs.patch" +6c9cbb7dc39a95e2eaa1000e11f445425b0a2b70d3bcb646a6781c7c7ec089d06e3a81259f9edf0a781cb9cb92059a9c883164c1e1c748949a122267cab2d811 add_more_archs.patch +9f81565c5812419f4b42e7cd9fe9f7c6082647df0b1ad3ae862049ea42afdcc9bac210ea5a5f192095b0b6951499669387dc6bf4a22809d75e976a4bf28c38f9 alpine-template-mount-shm.patch" diff --git a/main/lxc/alpine-template-mount-shm.patch b/main/lxc/alpine-template-mount-shm.patch new file mode 100644 index 0000000000..69eb8b3a22 --- /dev/null +++ b/main/lxc/alpine-template-mount-shm.patch @@ -0,0 +1,24 @@ +From 48938fe71da106587f94654246ea13d284c50291 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Wed, 12 Oct 2016 13:32:18 +0200 +Subject: [PATCH] lxc-alpine: mount /dev/shm as tmpfs + +Signed-off-by: Jakub Jirutka <jakub@jirutka.cz> +--- + config/templates/alpine.common.conf.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/config/templates/alpine.common.conf.in b/config/templates/alpine.common.conf.in +index 55ea3d2..1be61f7 100644 +--- a/config/templates/alpine.common.conf.in ++++ b/config/templates/alpine.common.conf.in +@@ -19,5 +19,8 @@ lxc.cap.drop = sys_tty_config + lxc.cap.drop = syslog + lxc.cap.drop = wake_alarm + +-# Mount tmpfs under /run. ++# Mount /run as tmpfs. + lxc.mount.entry=run run tmpfs rw,nodev,relatime,mode=755 0 0 ++ ++# Mount /dev/shm as tmpfs; needed for building python and possibly other packages. ++lxc.mount.entry=shm dev/shm tmpfs rw,nodev,noexec,nosuid,relatime,mode=1777,create=dir 0 0 |