diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2018-01-08 19:45:04 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-02-08 16:42:48 +0100 |
| commit | 8b6eb86d1fc8ab6b419055ea35fc72e522dca4e3 (patch) | |
| tree | 6fa5dd7605e782c16f1dad5de7ceb260c0cc9aaa | |
| parent | de2d9259abdaffc3af40d2e9c1cbd42dcc757793 (diff) | |
| download | aports-8b6eb86d1fc8ab6b419055ea35fc72e522dca4e3.tar.bz2 aports-8b6eb86d1fc8ab6b419055ea35fc72e522dca4e3.tar.xz | |
main/lxc: make $logdir in init script configurable
| -rw-r--r-- | main/lxc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/lxc/lxc.confd | 3 | ||||
| -rw-r--r-- | main/lxc/lxc.initd | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 362e375373..1a635cb558 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -5,7 +5,7 @@ pkgname=lxc pkgver=2.1.1 _pkgver=${pkgver/_rc/.rc} -pkgrel=3 +pkgrel=4 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -159,7 +159,7 @@ bashcomp() { sha512sums="205d30a8914013f3d31bdcae9786a13b6728ae0d3630f51c644f06e1e96d03631630569a0ce55764ff7b8ee1d1d4d723926fdb2b916396aea212d9c3040b45ab lxc-2.1.1.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch -690c11a4501a093623adc3191054ed0da8dabd21ac6f8c57197d1b4a689e660d5f196978cfb9b5de5406990706a8998f0c0d181229b1688b852ded614ad97529 lxc.initd -11bd08ef450086572fd09cfa40bf9168cb8aeb1e981fc881ae8484cd0a329c3bef262bb24880e7575ff5f75ee3caef0cb240fe5d7b770bf7ff54f2c430acd177 lxc.confd +204ff2903714c2e5664a622733dddd44d947e5228bf33361c2bbd6499465c1d81ccbfdbc31a43efc5773172a55e90def297f75089d27a30db391394524adfdda lxc.initd +91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467 lxc.confd 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf 02fd192d137cbb5b6db6959275387d05653f41dad5a5e46ae9b53cacead8cef937733927284658d3f0b910de81f9364c7f0248db990efd88806cf3029264c214 download-template-tmpfs.patch" diff --git a/main/lxc/lxc.confd b/main/lxc/lxc.confd index 7db541dc93..1badcf8616 100644 --- a/main/lxc/lxc.confd +++ b/main/lxc/lxc.confd @@ -5,3 +5,6 @@ # autostart groups (comma separated) #lxc_group="onboot" + +# Directory for containers' logs (used for symlinked runscripts lxc.*). +#logdir="/var/log/lxc" diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd index 26ddaed5f0..58ab6414e2 100644 --- a/main/lxc/lxc.initd +++ b/main/lxc/lxc.initd @@ -11,6 +11,7 @@ description_reboot="Reboot containers" CONTAINER=${SVCNAME#*.} : ${lxc_group:=$LXC_GROUP} : ${systemd_container:=no} +: ${logdir:=/var/log/lxc} command="/usr/bin/lxc-start" pidfile="/var/run/lxc/$CONTAINER.pid" @@ -96,7 +97,7 @@ start() { return fi - rm -f /var/log/lxc/${CONTAINER}.log + rm -f "$logdir"/${CONTAINER}.log rootpath=$(lxc_get_var lxc.rootfs.path) # verify that container is not on tmpfs @@ -107,7 +108,6 @@ start() { return 1 fi - local logdir=/var/log/lxc checkpath -d -m 750 -o root:wheel $logdir checkpath -d ${pidfile%/*} |