main/lxc: fixes for alpine template

- make sure /dev/shm is world writable
- create a defatul tty for console

3 files changed, 65 insertions, 4 deletions

diff --git a/main/lxc/0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch b/main/lxc/0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
new file mode 100644
index 0000000000..e5181285e5
--- /dev/null
+++ b/main/lxc/0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
@@ -0,0 +1,26 @@
+From ad583a72ac82361b62508e9a0510c61644074cb4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 7 Mar 2014 09:53:42 +0100
+Subject: [PATCH 1/2] lxc-alpine: make sure /dev/shm is world writeable
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ templates/lxc-alpine.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 7a22d5e..47df559 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -246,7 +246,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
++lxc.mount.entry=shm dev/shm tmpfs nodev,nosuid,noexec,mode=1777 0 0
+ 
+ EOF
+ 
+-- 
+2.1.3
+
diff --git a/main/lxc/0002-lxc-alpine-create-a-default-tty-for-console.patch b/main/lxc/0002-lxc-alpine-create-a-default-tty-for-console.patch
new file mode 100644
index 0000000000..53cb6031cc
--- /dev/null
+++ b/main/lxc/0002-lxc-alpine-create-a-default-tty-for-console.patch
@@ -0,0 +1,27 @@
+From 8f2f7845341dde2ec4184e531d05432e79e9936b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 27 Nov 2014 15:16:39 +0100
+Subject: [PATCH 2/2] lxc-alpine: create a default tty for console
+
+Create a tty so we get login prompt on console by default
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ templates/lxc-alpine.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 47df559..ba27aea 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -121,6 +121,7 @@ configure_alpine() {
+     cat >"$rootfs"/etc/inittab<<EOF
+ ::sysinit:/sbin/rc sysinit
+ ::wait:/sbin/rc default
++console:12345:respawn:/sbin/getty 38400 console
+ tty1:12345:respawn:/sbin/getty 38400 tty1
+ tty2:12345:respawn:/sbin/getty 38400 tty2
+ tty3:12345:respawn:/sbin/getty 38400 tty3
+-- 
+2.1.3
+
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index f1ceb29028..4206b48420 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=lxc
 pkgver=1.0.6
 _mypkgver=${pkgver/_rc/.rc}
-pkgrel=1
+pkgrel=2
 pkgdesc="linux containers - tools"
 url="http://lxc.sourceforge.net/"
 arch="all"
@@ -23,6 +23,8 @@ source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz
 	0002-fix-typo.patch
 	0003-Update-the-openvswitch-bridge-attach-code.patch
 
+	0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
+	0002-lxc-alpine-create-a-default-tty-for-console.patch
 	"
 
 _builddir="${srcdir}/lxc-lxc-${_mypkgver}"
@@ -95,16 +97,22 @@ md5sums="3949cd916a120f40c2355c9a5b65cd51  lxc-1.0.6.tar.gz
 1268d4b3e6ed004a47216b8714d09bfd  lxc.initd
 0800600ea0e9a0a4eab5822e8f14d6a2  0001-Support-openvswitch-bridges.patch
 82f16afb2cec1dfca66e4057daf02694  0002-fix-typo.patch
-fc502befeee596d5a1cf78d4f294a3e9  0003-Update-the-openvswitch-bridge-attach-code.patch"
+fc502befeee596d5a1cf78d4f294a3e9  0003-Update-the-openvswitch-bridge-attach-code.patch
+b0bf2ec6a49bd7d5a9db107c0d6bf925  0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
+b0eeceaa8a13df9d37f0739961320c25  0002-lxc-alpine-create-a-default-tty-for-console.patch"
 sha256sums="2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c  lxc-1.0.6.tar.gz
 b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9  version.patch
 bc108a722dc359a24c48837ef7012c776b1d20a533ae0e2231f75081dad4e2f5  lxc.initd
 a415aa17655788a49627eb2e06fd06b3f73dfea283a9c67c9bf7029430fcca88  0001-Support-openvswitch-bridges.patch
 e6502aa038b18dc4dff7eea6d916215babb8ce775d7c79b2fb7669edcc23ea97  0002-fix-typo.patch
-3a63dda403a2fab04fa5d2c9e7762efdcb911cbd913399b8226abdec6643fec9  0003-Update-the-openvswitch-bridge-attach-code.patch"
+3a63dda403a2fab04fa5d2c9e7762efdcb911cbd913399b8226abdec6643fec9  0003-Update-the-openvswitch-bridge-attach-code.patch
+b699d220332a1a004cd7305eed8700f80fc86160299fdbbaa234f6b545a17217  0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
+33fb2866dbfc1aabedee65fe2b5f3e8ebce1d081a1ea5d8734a43793308f40c6  0002-lxc-alpine-create-a-default-tty-for-console.patch"
 sha512sums="fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1  lxc-1.0.6.tar.gz
 e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def  version.patch
 6618ceb59f1927bb82ad1a0fe0a7d4c452ced7855d8f0953556fce9154f30a4c5afbd7a2ab07fb26e6e793b07d4c8f906f8dc27c1defe0580dcf1545c80d1d60  lxc.initd
 636dc009496f8648ba10aec6b590c2d1f5db17bf76161fec2b38a7a994198d2ac9c1af7e342f4d3e695d53951b5309447f20155fb79e00489a2f5c0513d08d89  0001-Support-openvswitch-bridges.patch
 dc5f5f230df91ea951e231aaedebab8217bcf6a676e2da88f4db3e0b36cdd922fb888c0f6a0eb34d5065add9c002b080c9ac687f9cd16875bd18d4f120f56d6e  0002-fix-typo.patch
-c7089b58dc7c4d2fc8cb245c7eb43930bd9e821e136e5461c3f79af063c640076c07d92afd5675cc57bb832e85690d917b87b337d075505a65e154efa7c45bc0  0003-Update-the-openvswitch-bridge-attach-code.patch"
+c7089b58dc7c4d2fc8cb245c7eb43930bd9e821e136e5461c3f79af063c640076c07d92afd5675cc57bb832e85690d917b87b337d075505a65e154efa7c45bc0  0003-Update-the-openvswitch-bridge-attach-code.patch
+fc86573f0b557cd7cb0fc99395d81ed0c78c22298bd36fe5a5581c428b80e7bd242fd5578abb576fb72c37e1cb9aac0e8f7611243d6bc92504d95c662e653eee  0001-lxc-alpine-make-sure-dev-shm-is-world-writeable.patch
+f645fa99b4706a45a05005f18a4fad6dbb8568f831cc9780d6b3c49fc045296309e649d754e69b72be2a55af584dd12560b449720e18f9f1627d8eb0e94a01f4  0002-lxc-alpine-create-a-default-tty-for-console.patch"