diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-09 17:26:22 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-09 17:27:34 +0000 |
| commit | c446cee86d3194c2bfa426fd4cced7508c361154 (patch) | |
| tree | 2d52dca47184ac470ed0b8958153f5addcc023ca /main/lxc | |
| parent | e6213ae623cbcdfd33366ef5dffb3ebd87fddc66 (diff) | |
| download | aports-c446cee86d3194c2bfa426fd4cced7508c361154.tar.bz2 aports-c446cee86d3194c2bfa426fd4cced7508c361154.tar.xz | |
main/lxc: misc fixes
- fix typo fro previous commit
- fix lxc-ls to work with busybox find
- comment out lxc.network.name for now as it does not seem to work
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 18 | ||||
| -rw-r--r-- | main/lxc/bb-find.patch | 11 | ||||
| -rw-r--r-- | main/lxc/bb-shutdown.patch | 2 | ||||
| -rwxr-xr-x | main/lxc/lxc-alpine | 2 |
4 files changed, 24 insertions, 9 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 227d96dac6..ec2c576ef0 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.8.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=5 +pkgrel=6 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 0001-lxc-start-add-option-p-pidfile-FILE-for-use-with-dae.patch bb-shutdown.patch + bb-find.patch lxc.initd setup-lxc-template setup-lxc-guest @@ -59,24 +60,27 @@ package() { md5sums="7304fa57146ce687f749b5df876bb20d lxc-0.8.0.tar.gz f0f675456a1751aded10aa428bda9e16 bb-rm.patch 1bf081cd9d66c65f3611ed4af58ef48f 0001-lxc-start-add-option-p-pidfile-FILE-for-use-with-dae.patch -5b4da5220bac07bfdebf701161c1d6a8 bb-shutdown.patch +c3f11f58e97ead80c855c88d6999ad65 bb-shutdown.patch +6a1a27c473274d422ec27364bd3580c3 bb-find.patch f3c6998798b13425b8d0647bad0834a8 lxc.initd 45d0f604310e58a1359f1745a4739843 setup-lxc-template c3f7fd7e85d40c4a4b1b427048ff9652 setup-lxc-guest -345996a4365b566d881d726fc6156ec2 lxc-alpine" +8dd4bc67ff8eda641804671df5796622 lxc-alpine" sha256sums="eac833730b94e423d4bef6834bc4a716437d2abd6ab8b24334c506aaaa08692c lxc-0.8.0.tar.gz e25b074eb09fdb471a2a816ab88df2f247f61ae8208a42044eaf91d1d5cc2fcc bb-rm.patch 0c3d8b40db692993b5d20dc9e6d6174579af8a2304e8f895bc5bce94eab4d6df 0001-lxc-start-add-option-p-pidfile-FILE-for-use-with-dae.patch -846c09def4e0fa796e7fe9df9f03947465a0407c6ce0565f21788293cdfadae7 bb-shutdown.patch +4847e4395a72737a6f94d2a1d835e246a7fb6925a961fa82022dd62358b34ecb bb-shutdown.patch +d4434b6c36578bffe24d477896a2d4b284c57b9b67214a3cd826d6af2f5d1e53 bb-find.patch 77c64e6137457be89c150b82d681a3eb5c7c1f06af142a321703fc9a43bff200 lxc.initd e027a75881d720f705c5b844b80b815de0db78df9deafde36dedb1e079d6387a setup-lxc-template 7a2aa24263efd925f90f4e7c3277f9f195465f121ff9557ae0c3408a5f95b328 setup-lxc-guest -e423a2abb2e6bc4df58c515a6ea06fd44932077b74b6211cef1272e2ba9809b4 lxc-alpine" +198b5a20952e7ef233f2b464e132a16a8d4bc314adb867479cc1c96fe382263f lxc-alpine" sha512sums="47333e2010d0f4488b8876ba933f2d26304874bec0371a7ab3b6e5bd1a50a7d2312ff8507e273f1ee2341a7f2e3b79cd71e5e19ac31006a4e429ee96b01733f6 lxc-0.8.0.tar.gz fd6c34a8775832b42e4b0a9f1e294a1bb54ecc6117277f8f02c1a24e4fc956480fe652aa889d0edf7d50fc1f36db3b7bca21d87a0365ab7b8763a20b0879806c bb-rm.patch f097d17eb306c25790fb4acfe48e3af86cca40c9250a94cbe5012321d0f07019fc5af0b31443352d0d458c9bfef7e05707263b381911a97285eeab49098176f0 0001-lxc-start-add-option-p-pidfile-FILE-for-use-with-dae.patch -6e9902a51374cb98cda92ff1629c791c942a10493d6aa84a52ddd8402db19cfea21952ae8ad2bfe63002f985e3db216d3618ffff5a6e36c2995df02320fad2f7 bb-shutdown.patch +bfd6aa6c02396115dd603f1ec93aae0cd8378e9d249adfa5ac543448f94f05452df00ef749ffc2264c2f6c16b4b32a9cfb3d5de67b70c364d641159261b7dd7f bb-shutdown.patch +b011d16a19cf3efd64aaf8f9ecba8f78320d8a57bb8fbb28d2a1787a2936b30b5d21d5c1581cd6a98422d2a0666788f7228d4fa285c3dcbfac0de739718f016f bb-find.patch 4e56f7b869345f936df54c4359abdd3b8d0244c0fd71a9a787bc2393c4caabca22ca8417f16da47f02c86294750986fd674d0d2e7c1b1d096076873b22c07a29 lxc.initd d9c4d20cc4e07b7bf53361c7ea51043c578faef09a8ed588e77362ce2f7d531348300a190d22f3787f41ed8bea24d1734c00a5a7143791a49451dde88b06d51b setup-lxc-template a3fa846878f9fb897a607a20ae6847c067dc651eaf8c3d8a75ecee1057638226591825723c7fe7ad38a6647c158b870101d72c660e8bebedbdc1fa95a1c5cf5c setup-lxc-guest -d3b25dfe2a34c4ed031c557dbf1d4b51c57d09d3a38a34573717f36b1e764704720f2b42fed09067af8d50427a15e9be94d1f08f5935f681a18947f4748e474f lxc-alpine" +60a039369dc0e6d18b6495e4df7276dcfcbba6d65df28281e0a51a1cde18398f7622a4f88b1cf55c86297dc775fd447038a26defc7d29693f2e7ff2369fd45d1 lxc-alpine" diff --git a/main/lxc/bb-find.patch b/main/lxc/bb-find.patch new file mode 100644 index 0000000000..663a81e070 --- /dev/null +++ b/main/lxc/bb-find.patch @@ -0,0 +1,11 @@ +--- ./src/lxc/lxc-ls.in.orig 2013-02-09 17:22:38.811308444 +0000 ++++ ./src/lxc/lxc-ls.in 2013-02-09 17:25:00.665833613 +0000 +@@ -87,7 +87,7 @@ + + containers="" + if [ ! -z "$directory" ]; then +- containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null) ++ containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -print 2>/dev/null | sed 's:.*/::') + fi + + if [ -z "$containers" ]; then diff --git a/main/lxc/bb-shutdown.patch b/main/lxc/bb-shutdown.patch index ec87000e44..bfda20e11b 100644 --- a/main/lxc/bb-shutdown.patch +++ b/main/lxc/bb-shutdown.patch @@ -20,7 +20,7 @@ exit 0 else - kill -PWR $pid -+ kill -s $signale_poweroff $pid ++ kill -s $signal_poweroff $pid fi if [ $dowait -eq 0 ]; then diff --git a/main/lxc/lxc-alpine b/main/lxc/lxc-alpine index a9b1de2f11..96eb53d39c 100755 --- a/main/lxc/lxc-alpine +++ b/main/lxc/lxc-alpine @@ -77,7 +77,7 @@ lxc.utsname = $hostname #lxc.aa_profile = unconfined # network interface -lxc.network.name = eth0 +#lxc.network.name = eth0 lxc.network.type = veth lxc.network.flags = up # enable for bridging |