diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-27 21:52:14 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-27 21:52:14 +0200 |
| commit | 6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (patch) | |
| tree | 1059a01ced7c62a2eda6bdc9f455f4a9fa960f23 /community/mcelog | |
| parent | a8cf07d2b8d0ba62d36021e51e72d7f2f47dd8d1 (diff) | |
| parent | 869e64b12767be3ef5b1e3628f337a9e116e2bbb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pawm/PKGBUILD
extra/kdesdk/PKGBUILD
Diffstat (limited to 'community/mcelog')
| -rw-r--r-- | community/mcelog/PKGBUILD | 7 | ||||
| -rw-r--r-- | community/mcelog/mcelog.service | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 9d60906c3..6de98e94e 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $ +# $Id: PKGBUILD 78891 2012-10-26 13:18:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=1.0pre3 -pkgrel=4 +pkgrel=5 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64' 'mips64el') options=('docs') +backup=('etc/mcelog/mcelog.conf') #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" "${pkgname}.rc" "mcelog.service") md5sums=('b42f2214de6f4feb992556149edc67fa' 'f039a77d7bde3518d3d695b144816e8a' - '4e563f1124c09b3368532d37f9f4bba3') + 'a8859012781f017624bbfe61c9d700bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service index 62d8cbed0..c689bee77 100644 --- a/community/mcelog/mcelog.service +++ b/community/mcelog/mcelog.service @@ -2,15 +2,9 @@ Description=Machine Check Exception Logging Daemon After=syslog.target -# FIXME - due to upstream kernel bug always start the mcelog process -# twice using the following ExecStartPre hack. This needs fixing. -# There is a bug filed against systemd for the ExecStartPre bit -# since it is not possible to specify that the ExecStarPre bit -# is allowed and expected to fail without aborting the daemon. - [Service] -ExecStartPre=/etc/mcelog/mcelog.setup -ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground +PIDFile=/var/run/mcelog.pid +ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /var/run/mcelog.pid StandardOutput=syslog [Install] |