瀏覽代碼

package/syslog-ng: implement systemd enablement using DefaultInstance

Instead of using a manual symlink we use add a DefaultInstance= to the
config file

This is how upstream wants us to do it and allows systemctl preset to
correctly restore it if needed

Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
[yann.morin.1998@free.fr:
  - split long line
  - no need for continued line (no use for ';\' )
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Jérémy Rosen 5 年之前
父節點
當前提交
54ea03ccd7
共有 1 個文件被更改,包括 3 次插入5 次删除
  1. 3 5
      package/syslog-ng/syslog-ng.mk

+ 3 - 5
package/syslog-ng/syslog-ng.mk

@@ -105,11 +105,9 @@ endef
 # By default syslog-ng installs a .service that requires a config file at
 # /etc/default, so provide one with the default values.
 define SYSLOG_NG_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -m 0644 -D package/syslog-ng/syslog-ng@default \
-		$(TARGET_DIR)/etc/default/syslog-ng@default
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -sf ../../../../usr/lib/systemd/system/syslog-ng@.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog-ng@default.service
+	mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d
+	printf '[Install]\nDefaultInstance=default\n' \
+		>$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d/buildroot-default-instance.conf
 endef
 
 # By default syslog-ng installs a number of sample configuration