diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-27 20:25:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-27 20:25:44 +0000 |
| commit | 590666635836b89d298e44d7764b3cdb34dd722b (patch) | |
| tree | e955f31184952e40f06fe5b07e6f35cdf3e7dd8c /main/lxc | |
| parent | 5de16cbe0d926037839ed12d3a8b5adff657e688 (diff) | |
| download | aports-590666635836b89d298e44d7764b3cdb34dd722b.tar.bz2 aports-590666635836b89d298e44d7764b3cdb34dd722b.tar.xz | |
main/lxc: improve init script
Use lxc-wait instead of letting start-stop-daemon look for the pid.
This should speed up the startup with up to 500ms.
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/lxc/lxc.initd | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 4a3186a64a..42d7c42786 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=1.0.0 _mypkgver=${pkgver/_rc/.rc} -pkgrel=1 +pkgrel=2 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -86,10 +86,10 @@ dev() { md5sums="65676ae30e6eb7e6b20ee51e6f54df06 lxc-1.0.0.tar.gz 79e90616b5049a472ccdcb5b1dcdd8b1 version.patch -9f780f761dcaec3ce40d083c6df044d4 lxc.initd" +013ab9f96e528b94bddacd2b73aca16d lxc.initd" sha256sums="21c5da23825c502a00f127abbdc5ee42366db6d876cbd7500765b57a5a4767b7 lxc-1.0.0.tar.gz b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch -8bdb64ecf100b648396456f6765230aab8649665bfcf320baede529ce6c5484d lxc.initd" +fd65124a887bf41bfb0ac94c562215bc57b269791922f0a35ee4d6e2a930002d lxc.initd" sha512sums="6a6ed2bd995cededadb35eac007ea2eb14ff4cb6d10c99bf0466a0f16fa33172393f275b53337f9f00b419b0fa9b6dbbba5d0fe132044a0677fcab33d668974e lxc-1.0.0.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch -e3aa39c60db6ba73cbe3fcb27170dd83a03a0a175d8a28513f242a81eef5cb0e90b78dc63fc8da5c7160e60bc780111679fd6d0e401a0d6626e574c328c5afb0 lxc.initd" +7bb47a41aaf9c7afe6769b3700d99d972d44953f0e900841f21644bfaa5f05c8d56494d5400e0cab684235bc947721c5683a8d8407827249a9d25eaca036b122 lxc.initd" diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd index ae844872a5..298051f1f1 100644 --- a/main/lxc/lxc.initd +++ b/main/lxc/lxc.initd @@ -61,29 +61,26 @@ start() { ebegin "Starting container ${CONTAINER}" start-stop-daemon --start $command \ --pidfile $pidfile \ - --wait 500 \ -- \ --daemon \ --pidfile $pidfile \ --name ${CONTAINER} \ --rcfile ${CONFIGFILE} \ --logpriority WARN \ - --logfile /var/log/lxc/${CONTAINER}.log + --logfile /var/log/lxc/${CONTAINER}.log \ + || eend $? || return $? + lxc-wait -n ${CONTAINER} -t 5 -s RUNNING eend $? } stop() { checkconfig || return 1 - ebegin "Shutting down system in container ${CONTAINER}" + ebegin "Stopping container ${CONTAINER}" start-stop-daemon --stop --pidfile ${pidfile} \ --retry ${POWEROFF_SIGNAL:-SIGUSR2}/${TIMEOUT:-30} \ --progress eend $? - - ebegin "Stopping containter ${CONTAINER}" - lxc-stop -n ${CONTAINER} - eend $? } reboot() { |