diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-03-26 11:15:18 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-03-26 11:15:18 +0200 |
| commit | 7c8769b7518d1396ab0ffb255a4dcb0e17c0da9a (patch) | |
| tree | 33a2cd14c0923a2adf69a825960095a42ffd6556 /data/live-build-config/includes.chroot | |
| parent | e95956a3ad834cf442678ec90be638aefcd8a2d1 (diff) | |
| parent | 65b82136a19549fcaf7ae1a81daa46695a6c08e1 (diff) | |
| download | vyos-build-7c8769b7518d1396ab0ffb255a4dcb0e17c0da9a.tar.gz vyos-build-7c8769b7518d1396ab0ffb255a4dcb0e17c0da9a.zip | |
Merge branch 'current' of github.com:vyos/vyos-build into current
Diffstat (limited to 'data/live-build-config/includes.chroot')
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/systemd/journald.conf | 2 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/systemd/system.conf | 55 |
2 files changed, 57 insertions, 0 deletions
diff --git a/data/live-build-config/includes.chroot/etc/systemd/journald.conf b/data/live-build-config/includes.chroot/etc/systemd/journald.conf index 07612424..5aecf4f8 100644 --- a/data/live-build-config/includes.chroot/etc/systemd/journald.conf +++ b/data/live-build-config/includes.chroot/etc/systemd/journald.conf @@ -1,3 +1,5 @@ +# This file is managed in vyos-build +# # This file is part of systemd. # # systemd is free software; you can redistribute it and/or modify it diff --git a/data/live-build-config/includes.chroot/etc/systemd/system.conf b/data/live-build-config/includes.chroot/etc/systemd/system.conf new file mode 100644 index 00000000..91af4090 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/systemd/system.conf @@ -0,0 +1,55 @@ +# This file is managed in vyos-build +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# See systemd-system.conf(5) for details + +[Manager] +#LogLevel=info +#LogTarget=journal-or-kmsg +#LogColor=yes +#LogLocation=no +#DumpCore=yes +#CrashShell=no +ShowStatus=yes +#CrashChVT=1 +#CPUAffinity=1 2 +#JoinControllers=cpu,cpuacct net_cls,net_prio +#RuntimeWatchdogSec=0 +#ShutdownWatchdogSec=10min +#CapabilityBoundingSet= +#SystemCallArchitectures= +#TimerSlackNSec= +#DefaultTimerAccuracySec=1min +#DefaultStandardOutput=journal +#DefaultStandardError=inherit +#DefaultTimeoutStartSec=90s +#DefaultTimeoutStopSec=90s +#DefaultRestartSec=100ms +#DefaultStartLimitInterval=10s +#DefaultStartLimitBurst=5 +#DefaultEnvironment= +#DefaultCPUAccounting=no +#DefaultBlockIOAccounting=no +#DefaultMemoryAccounting=no +#DefaultLimitCPU= +#DefaultLimitFSIZE= +#DefaultLimitDATA= +#DefaultLimitSTACK= +#DefaultLimitCORE= +#DefaultLimitRSS= +#DefaultLimitNOFILE= +#DefaultLimitAS= +#DefaultLimitNPROC= +#DefaultLimitMEMLOCK= +#DefaultLimitLOCKS= +#DefaultLimitSIGPENDING= +#DefaultLimitMSGQUEUE= +#DefaultLimitNICE= +#DefaultLimitRTPRIO= +#DefaultLimitRTTIME= |