From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Jun 2018 19:07:19 +0000 (+0900)
Subject: core: add missing option and drop nonexistent option in system.conf
X-Git-Tag: v240~1019^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e761599ffd1ce97b11f617c8f011f6e54349d547;p=thirdparty%2Fsystemd.git

core: add missing option and drop nonexistent option in system.conf
---

diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index f0a59a79a5f..639b5818ffb 100644
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -26,6 +26,7 @@
 #JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
+#WatchdogDevice=
 #CapabilityBoundingSet=
 #NoNewPrivileges=no
 #SystemCallArchitectures=
@@ -62,5 +63,3 @@
 #DefaultLimitNICE=
 #DefaultLimitRTPRIO=
 #DefaultLimitRTTIME=
-#IPAddressAllow=
-#IPAddressDeny=