diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-10 12:51:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-10 13:11:27 +0000 |
| commit | d95963a7617dd0c3d7e515ab0365807e77590056 (patch) | |
| tree | 14888ff6da300cc7fad6e8d162ebe44aaee33739 /main/lxc | |
| parent | 70163d9da371acac9b3a91f6b2c6c17047421dfa (diff) | |
| download | aports-d95963a7617dd0c3d7e515ab0365807e77590056.tar.bz2 aports-d95963a7617dd0c3d7e515ab0365807e77590056.tar.xz | |
main/lxc: fix error handling when lxc.utsname is unset
(cherry picked from commit 0ca90c014d3039521298a7a4310f47451d498066)
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/lxc/lxc.initd | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index c7abe0a5d3..1d802af8be 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=7 +pkgrel=8 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -77,7 +77,7 @@ c12ea194274b6c8d3b05bd43ed70c61d 0001-lxc-alpine-enable-4-consoles-by-default.p 75979789ec45ef865895f5ce5721dd3e 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 9dd77bd91171287e1cbab2662a129a44 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch -9f780f761dcaec3ce40d083c6df044d4 lxc.initd" +1b8897467bc1538b4e1a497beef3bb1d lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc bb-rm.patch 0e5706cb077f750afdd6a5a4fd2afdf0b9113126c85e130d92680bed4ce9c20e bb-shutdown.patch @@ -91,7 +91,7 @@ eb5043672ef81cd5b20f25dc847bfad7e9e14b42a794856c3a8c8c1e4e408dfc 0001-lxc-alpin 51bd2fc5f166499c8996d1b89f324168b0c1bbb6b2b79260591d442120098a34 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch 9bb8fd6176cecfd35faf1fb4ba2c3c10d11338064f795b04061029ae38550cea 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch -8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" +f7bc6006df1156b07f39b6a9638bc18a21bdc8b3bdd069dcb17e435d73fe2035 lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc221ac457db3bed4a199491059a15f66755deddc93ce91bf1 bb-rm.patch 86df52e380a01d6d3f588ca395925e8f774529c72e5b4c8dcb701d79fad7697ed8800f0ff51fded2896b2d2af49faa7f26960234fc8c1a6b4bc8f42d85078e6d bb-shutdown.patch @@ -105,4 +105,4 @@ dd686d8ce9cd73807b744163e6b20e41eca17f3ee618cef66f19488cb2527b56d38c04231d25177d 75130578c4103586b973c6e9586833acfa89de8021f4dd320385905c4f9d3d1bf7a1e8d3cfe8704a3add00d41d19c30a371bce232a863e9c837a148e9066a0d6 0001-lxc-alpine-run-bootmisc-and-syslog-at-boot-runlevel.patch bdb03020f4eb2f7815f7783c071c144f3b9f7976717e5b14e75e720f13348a751ea6b1a29ab14c6278ca41f4f911b3640252e58ae0d7ffe2cc97e9ce143b394a 0001-lxc-alpine-mount-tmpfs-on-dev-shm.patch 2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch -e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" +363e4f5560208b1bb1a0ae6f022486a88a162c0f7197619c3cf14ba5fe862e2f90fbf33f862b5fb32a0cd3d153ff3207f788c91865c1b1c226daf6d6108f49aa lxc.initd" diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd index ae844872a5..e8ae63b8cc 100644 --- a/main/lxc/lxc.initd +++ b/main/lxc/lxc.initd @@ -45,9 +45,9 @@ checkconfig() { [ -z "${CONFIGFILE}" ] && return 1 utsname=$(lxc_get_var lxc.utsname) - if [ ${CONTAINER} != ${utsname} ]; then + if [ "${CONTAINER}" != "${utsname}" ]; then eerror "You should use the same name for the service and the" - eerror "container. Right now the container is called ${utsname}" + eerror "lxc.utsname. Right now the lxc.utsname is set to ${utsname}" return 1 fi } |