summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nicoulaud2019-10-27 18:35:24 +0100
committerJulien Nicoulaud2019-10-27 18:35:24 +0100
commit8499008aefc178917f7fc16085c6ed3851aad520 (patch)
tree7f3f30113ac069dfbdc5ab7a61c0ed8b1afeb92a
parentd2bce4774e7d1406b6cb0e6b030fcc2a3595f642 (diff)
downloadaur-8499008aefc178917f7fc16085c6ed3851aad520.tar.gz
fixes from https://aur.archlinux.org/packages/oomd/#comment-711090
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--oomd.service12
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 62f37257f54f..4156810f0144 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = oomd
pkgdesc = A userspace out-of-memory killer.
pkgver = 0.2.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/facebookincubator/oomd
install = oomd.install
arch = x86_64
@@ -23,7 +23,7 @@ pkgbase = oomd
source = oomd.service
source = oomd.default
sha512sums = f6ce5483d96ca54558642ec60ce28b6f5ad63460c3af2cda17fdbdea125bc31236a2468db7125077d2a68ca951a21b1ad853e31869fe957ab261b5ec55e7992c
- sha512sums = b1bba1648c97ed0f681966dd3efd3ac25b018d310a566b937bece055d5d1a91a0739d96ca141914b8db3f9424b02093dd6f5cf501f7f55922e441fb447a4bd2c
+ sha512sums = 0515f2ec37c654830e7b14ac1fd721eda4932e152502e454e06df5ab01aab1a1d15423c1bc8d593412cd7616a441d46dc1b05564f79b157045fd69c0555da20b
sha512sums = 1db7c71b1b1d21ba5ebe10add5b1b37c6df2169f24938f91170833eddb40e7acf58726cb01e528f340d66ada18b557b26f9c07b542a253d15f04c440e7cd1eb8
pkgname = oomd
diff --git a/PKGBUILD b/PKGBUILD
index 4d8d64242336..dd773752c7b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=oomd
pkgver=0.2.0
-pkgrel=1
+pkgrel=2
pkgdesc='A userspace out-of-memory killer.'
arch=('x86_64')
url='https://github.com/facebookincubator/oomd'
@@ -18,7 +18,7 @@ source=("https://github.com/facebookincubator/${pkgname}/archive/v${pkgver}.tar.
"${pkgname}.service"
"${pkgname}.default")
sha512sums=('f6ce5483d96ca54558642ec60ce28b6f5ad63460c3af2cda17fdbdea125bc31236a2468db7125077d2a68ca951a21b1ad853e31869fe957ab261b5ec55e7992c'
- 'b1bba1648c97ed0f681966dd3efd3ac25b018d310a566b937bece055d5d1a91a0739d96ca141914b8db3f9424b02093dd6f5cf501f7f55922e441fb447a4bd2c'
+ '0515f2ec37c654830e7b14ac1fd721eda4932e152502e454e06df5ab01aab1a1d15423c1bc8d593412cd7616a441d46dc1b05564f79b157045fd69c0555da20b'
'1db7c71b1b1d21ba5ebe10add5b1b37c6df2169f24938f91170833eddb40e7acf58726cb01e528f340d66ada18b557b26f9c07b542a253d15f04c440e7cd1eb8')
prepare() {
diff --git a/oomd.service b/oomd.service
index 635923059074..5eaeeec480fe 100644
--- a/oomd.service
+++ b/oomd.service
@@ -12,15 +12,13 @@ Environment=OOMD_CONFIG=/etc/oomd.json
Environment=OOMD_INTERVAL=5
EnvironmentFile=-/etc/default/oomd
-ExecStartPre=/usr/bin/oomd_bin --check-config ${OOMD_CONFIG}
-ExecStart=/usr/bin/oomd_bin --config ${OOMD_CONFIG} --interval ${OOMD_INTERVAL}
+ExecStartPre=/usr/bin/oomd --check-config ${OOMD_CONFIG}
+ExecStart=/usr/bin/oomd --config ${OOMD_CONFIG} --interval ${OOMD_INTERVAL}
-CapabilityBoundingSet=
+CapabilityBoundingSet=
NoNewPrivileges=yes
-PrivateTmp=yes
DevicePolicy=closed
DeviceAllow=/dev/kmsg
-ProtectSystem=strict
ProtectHome=yes
ProtectControlGroups=yes
ProtectKernelModules=yes
@@ -33,5 +31,9 @@ LockPersonality=true
SystemCallArchitectures=native
SystemCallFilter=@system-service
+# See https://aur.archlinux.org/packages/oomd/#comment-711090
+# PrivateTmp=yes
+# ProtectSystem=strict
+
[Install]
WantedBy=multi-user.target