Merge pull request #27677 from peterhoeg/u/mcelog

mcelog: 148 -> 153
This commit is contained in:
Graham Christensen 2017-07-27 06:34:10 -04:00 committed by GitHub
commit 107d931b44
2 changed files with 21 additions and 17 deletions

View file

@ -3,7 +3,7 @@
with lib;
{
meta.maintainers = [ maintainers.grahamc ];
meta.maintainers = with maintainers; [ grahamc ];
options = {
hardware.mcelog = {
@ -19,19 +19,17 @@ with lib;
};
config = mkIf config.hardware.mcelog.enable {
systemd.services.mcelog = {
description = "Machine Check Exception Logging Daemon";
wantedBy = [ "multi-user.target" ];
systemd = {
packages = [ pkgs.mcelog ];
serviceConfig = {
ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
SuccessExitStatus = [ 0 15 ];
ProtectHome = true;
PrivateNetwork = true;
PrivateTmp = true;
services.mcelog = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ProtectHome = true;
PrivateNetwork = true;
PrivateTmp = true;
};
};
};
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mcelog-${version}";
version = "148";
version = "153";
src = fetchFromGitHub {
sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
rev = "v${version}";
repo = "mcelog";
owner = "andikleen";
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
};
postPatch = ''
@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
postInstall = ''
mkdir -p $out/lib/systemd/system
substitute mcelog.service $out/lib/systemd/system/mcelog.service \
--replace /usr/sbin $out/bin
'';
meta = with stdenv.lib; {
description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
longDescription = ''