From 4006b64e3a92f3e7168873588409283a4d6625fc Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 22 Oct 2013 21:24:19 +0200 Subject: [PATCH] systemd: also read /etc/sysconfig/lldpd While systemd's author says that we should get rid of those pseudo-configuration files, keeping compatibility with previous ways to configure daemons seem a valid reason to keep them. `/etc/default` is Debian specific. We also read the equivalent one for RedHat to ensure that everything will also continue to work here. http://0pointer.de/blog/projects/on-etc-sysinit.html --- src/daemon/lldpd.service.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/daemon/lldpd.service.in b/src/daemon/lldpd.service.in index a61d79fa..630aa487 100644 --- a/src/daemon/lldpd.service.in +++ b/src/daemon/lldpd.service.in @@ -8,7 +8,8 @@ RequiresMountsFor=@PRIVSEP_CHROOT@ Type=notify NotifyAccess=main EnvironmentFile=-/etc/default/lldpd -ExecStart=@prefix@/sbin/lldpd $DAEMON_ARGS +EnvironmentFile=-/etc/sysconfig/lldpd +ExecStart=@prefix@/sbin/lldpd $DAEMON_ARGS $LLDPD_OPTIONS ExecStartPre=/bin/mkdir -p @PRIVSEP_CHROOT@/etc ExecStartPre=/bin/cp /etc/localtime @PRIVSEP_CHROOT@/etc/localtime Restart=on-failure -- 2.39.5