From: Paul Hänsch Date: Thu, 19 Sep 2019 22:39:07 +0000 (+0200) Subject: merge from vhs-kurs X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=b8625b8dc6dba10b8f850f70093ed5fa5a54812f;p=blast merge from vhs-kurs --- diff --git a/modules/nodm.mk b/modules/nodm.mk index 55267ba..6d8d760 100644 --- a/modules/nodm.mk +++ b/modules/nodm.mk @@ -35,7 +35,7 @@ endif .PHONY: _nodm_user _nodm_cfg _nodm_cfg: ${CFGROOT} - sed -Ei 's;^TimeoutStopSec=.*$$;TimeoutStopSec=2;' "$${CFGROOT}/lib/systemd/system/nodm.service" + sed -Ei 's;^TimeoutStopSec=.*$$;TimeoutStopSec=1;' "$${CFGROOT}/lib/systemd/system/nodm.service" rm "$${CFGROOT}/etc/default/nodm" chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm