diff options
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/0001-fallback-from-udev-to-mdev.patch | 29 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 15 |
2 files changed, 42 insertions, 2 deletions
diff --git a/main/lxc/0001-fallback-from-udev-to-mdev.patch b/main/lxc/0001-fallback-from-udev-to-mdev.patch new file mode 100644 index 0000000000..a14feff595 --- /dev/null +++ b/main/lxc/0001-fallback-from-udev-to-mdev.patch @@ -0,0 +1,29 @@ +From bd784acbbf0ea501d2b63be2c6f7fe0cfa179886 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Mon, 17 Feb 2014 14:00:08 +0000 +Subject: [PATCH] fallback from udev to mdev + +--- + src/lxc/lxc-create.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in +index ebbdd7b..44ac8e6 100644 +--- a/src/lxc/lxc-create.in ++++ b/src/lxc/lxc-create.in +@@ -330,7 +330,11 @@ fi + if [ "$backingstore" = "lvm" ]; then + [ -d "$rootfs" ] || mkdir $rootfs + lvcreate -L $fssize -n $lvname $vgname || exit 1 +- udevadm settle ++ if [ -x /sbin/udevadm ]; then ++ udevadm settle ++ else ++ mdev -s ++ fi + mkfs -t $fstype $rootdev || exit 1 + mount -t $fstype $rootdev $rootfs + fi +-- +1.8.5.4 + diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 417fd90053..950cdf477e 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=9 +pkgrel=10 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -12,7 +12,7 @@ depends="bash" depends_dev="libcap-dev" makedepends="$depends_dev" install="" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm" source="http://linuxcontainers.org/downloads/lxc-$_mypkgver.tar.gz bb-rm.patch bb-shutdown.patch @@ -28,6 +28,7 @@ source="http://linuxcontainers.org/downloads/lxc-$_mypkgver.tar.gz 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 0001-Don-t-include-linux-if_bridge.h.patch + 0001-fallback-from-udev-to-mdev.patch lxc-fix-headers.patch lxc.initd @@ -66,6 +67,13 @@ package() { install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc } +lvm() { + pkgdesc="linux containers lvm support" + depends="lvm util-linux" + arch="noarch" + mkdir "$subpkgdir" +} + md5sums="8552a4479090616f4bc04d8473765fc9 lxc-0.9.0.tar.gz a0894c2ddf9133c3cc33c264e4596a3c bb-rm.patch e96514860ee34b62d1b208ab03c569bc bb-shutdown.patch @@ -80,6 +88,7 @@ c12ea194274b6c8d3b05bd43ed70c61d 0001-lxc-alpine-enable-4-consoles-by-default.p 6c188f8dd2ba18e895eed2dec79fcab9 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch c172314d12b6bc2ef7b39e891bb74a9c 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 83e105a961993d46fb901e49230c69f2 0001-Don-t-include-linux-if_bridge.h.patch +97279f1d46b9f7c07d43b7ca69513bad 0001-fallback-from-udev-to-mdev.patch 24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch 9f780f761dcaec3ce40d083c6df044d4 lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz @@ -96,6 +105,7 @@ eb5043672ef81cd5b20f25dc847bfad7e9e14b42a794856c3a8c8c1e4e408dfc 0001-lxc-alpin 92d7f479d8d466e03f187076a1187112a116f3a37426ba6d1dfd87ed7999c4c8 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch b85e307faaacfa79854564032e17325bc30efdccf9e8ab3929ab7b44a5a74205 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch f0911ff82ef8fc3f1832f3af771fe6d9944f12d7409feb7d4233136e6720ad05 0001-Don-t-include-linux-if_bridge.h.patch +ccc57c12f81f68b6d21688982bebb11f98840ca2288b8e9966d2078cd95bd9f8 0001-fallback-from-udev-to-mdev.patch 82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch 8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz @@ -112,5 +122,6 @@ dd686d8ce9cd73807b744163e6b20e41eca17f3ee618cef66f19488cb2527b56d38c04231d25177d 7c5e6656565ed0ec51449baab4d310520cc43805428515d6541d4c4e03cc2f44b6762b3239983ee06596dcdec68d395250f944aabe92afc91ba2432f4847555b 0001-lxc-alpine-copy-etc-TZ-to-container-if-present.patch 850bc35c56e7c7b7e7a3efde504e2ceefbb790a3298d96e195ab610a83a946b3783e409ce14639fb9e8ac03ccc05b973c0c81803c514148c0e1c726249277eaa 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch ebdc01504a3e4d48ba96f6e9c6786c02f6803a14ae6754f52aee12c462c7a24e678cf520318662e2f7e4efcd65cd577c2d415ca13fcb7ace323f59bdcfec9f75 0001-Don-t-include-linux-if_bridge.h.patch +fa5d69ced46ecb5994f615f70589fd70eaecd8b9d8873887afff6ce0671efbf0e2518ed3e873c25ca8367d860d0f1ba34b17f57563a9c18b84cf6c20c1bdf52a 0001-fallback-from-udev-to-mdev.patch 2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" |