main/lxc: fix /dev/zero on container create

fixes #2226

2 files changed, 31 insertions, 1 deletions

diff --git a/main/lxc/0001-lxc-alpine-create-dev-zero.patch b/main/lxc/0001-lxc-alpine-create-dev-zero.patch
new file mode 100644
index 0000000000..b420496563
--- /dev/null
+++ b/main/lxc/0001-lxc-alpine-create-dev-zero.patch
@@ -0,0 +1,26 @@
+From 48c63f8d035045af1103b677b5ec577aec59a5b5 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 26 Aug 2013 13:47:58 +0200
+Subject: [PATCH] lxc-alpine: create /dev/zero
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+Signed-off-by: Serge Hallyn <serge.hallyn@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 ce7226f..2ab10bb 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -126,6 +126,7 @@ EOF
+     echo "Setting up device nodes"
+     mkdir -p -m 755 "$rootfs/dev/pts"
+     mkdir -p -m 1777 "$rootfs/dev/shm"
++    mknod -m 666 "$rootfs/dev/zero" c 1 5
+     mknod -m 666 "$rootfs/dev/full" c 1 7
+     mknod -m 666 "$rootfs/dev/random" c 1 8
+     mknod -m 666 "$rootfs/dev/urandom" c 1 9
+-- 
+1.8.4
+
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 4a65633b7a..408871eb4d 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=lxc
 pkgver=0.9.0
 _mypkgver=${pkgver/_rc/-rc}
-pkgrel=1
+pkgrel=2
 pkgdesc="linux containers - tools"
 url="http://lxc.sourceforge.net/"
 arch="all"
@@ -17,6 +17,7 @@ source="http://lxc.sourceforge.net/download/lxc/$pkgname-$_mypkgver.tar.gz
         bb-rm.patch
         bb-shutdown.patch
         alpine-template-backport.patch
+        0001-lxc-alpine-create-dev-zero.patch
         lxc.initd
         "
 
@@ -52,14 +53,17 @@ md5sums="8552a4479090616f4bc04d8473765fc9  lxc-0.9.0.tar.gz
 a0894c2ddf9133c3cc33c264e4596a3c  bb-rm.patch
 e96514860ee34b62d1b208ab03c569bc  bb-shutdown.patch
 25dd200bd158d16a05bb3e7aaef84697  alpine-template-backport.patch
+e08b77b3b35adac290b49b9c9e04754c  0001-lxc-alpine-create-dev-zero.patch
 f3c6998798b13425b8d0647bad0834a8  lxc.initd"
 sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120  lxc-0.9.0.tar.gz
 c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc  bb-rm.patch
 0e5706cb077f750afdd6a5a4fd2afdf0b9113126c85e130d92680bed4ce9c20e  bb-shutdown.patch
 df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b  alpine-template-backport.patch
+8b3b314d99209ae27d78cd4e9469638a945d68d03beefaec499bad373a7cb8cd  0001-lxc-alpine-create-dev-zero.patch
 77c64e6137457be89c150b82d681a3eb5c7c1f06af142a321703fc9a43bff200  lxc.initd"
 sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606  lxc-0.9.0.tar.gz
 b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc221ac457db3bed4a199491059a15f66755deddc93ce91bf1  bb-rm.patch
 86df52e380a01d6d3f588ca395925e8f774529c72e5b4c8dcb701d79fad7697ed8800f0ff51fded2896b2d2af49faa7f26960234fc8c1a6b4bc8f42d85078e6d  bb-shutdown.patch
 d10e25aeee0aba61a4c3420fe1b2bfd9213e7ef10f399ed5f0ba5d978a97a49fd23044b098f73f6d9651c23b1bb025f30d81deb6aec9edf4d2267afc22a09d60  alpine-template-backport.patch
+0304aabfac3280cbc18347f1168b2289a98e03b9f6a3134770e43bb914978a64a108a0b0ec709856db161e98366c06c8a65d5a30e730add4cee2968718cdc93a  0001-lxc-alpine-create-dev-zero.patch
 4e56f7b869345f936df54c4359abdd3b8d0244c0fd71a9a787bc2393c4caabca22ca8417f16da47f02c86294750986fd674d0d2e7c1b1d096076873b22c07a29  lxc.initd"