summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Cao2019-11-24 14:30:50 +0800
committerNick Cao2019-11-24 14:30:50 +0800
commit372b3d741075e7f022dc46e8ed79f4edb1b8aa1f (patch)
tree7386526bba3379886636432ab45f3a1c781bc803
parentce2e0ab1b8624b8e8cf2b5413f4072f0b32f7398 (diff)
downloadaur-372b3d741075e7f022dc46e8ed79f4edb1b8aa1f.tar.gz
revert the wrong fix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--oomd.install2
-rw-r--r--oomd.service2
4 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3488034defd1..90dfcbc5808f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = oomd
pkgdesc = A userspace out-of-memory killer.
pkgver = 0.2.0
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/facebookincubator/oomd
install = oomd.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 1b1d8c8da4ee..215dbcfeb81b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=oomd
pkgver=0.2.0
-pkgrel=5
+pkgrel=6
pkgdesc='A userspace out-of-memory killer.'
arch=('x86_64')
url='https://github.com/facebookincubator/oomd'
diff --git a/oomd.install b/oomd.install
index 4f58d09d4967..e42322d88b2f 100644
--- a/oomd.install
+++ b/oomd.install
@@ -3,5 +3,7 @@ post_install() {
==> An example oomd configuration has been deployed to /etc/oomd.json, please modify it according to your needs.
==> A systemd service is also available, it can be configured in /etc/default/oomd and started with:
==> $ sudo systemctl start oomd
+==> ATTETION: add systemd.unified_cgroup_hierarchy=1 to your kernel cmdline for oomd to work correctly
+==> reference: https://github.com/facebookincubator/oomd/issues/67#issuecomment-524315033
EOF
}
diff --git a/oomd.service b/oomd.service
index 990e7b92eaf9..5eaeeec480fe 100644
--- a/oomd.service
+++ b/oomd.service
@@ -13,7 +13,7 @@ Environment=OOMD_INTERVAL=5
EnvironmentFile=-/etc/default/oomd
ExecStartPre=/usr/bin/oomd --check-config ${OOMD_CONFIG}
-ExecStart=/usr/bin/oomd --config ${OOMD_CONFIG} --interval ${OOMD_INTERVAL} --cgroup-fs /sys/fs/cgroup/unified/
+ExecStart=/usr/bin/oomd --config ${OOMD_CONFIG} --interval ${OOMD_INTERVAL}
CapabilityBoundingSet=
NoNewPrivileges=yes