From patchwork Fri Jan 18 18:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1027689 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=datacom.com.br Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43h9034jQRz9sD9 for ; Sat, 19 Jan 2019 05:46:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 176B1863F1; Fri, 18 Jan 2019 18:46:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yLx5i1tIZZGu; Fri, 18 Jan 2019 18:46:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9FA738669E; Fri, 18 Jan 2019 18:46:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8D09D1BF48D for ; Fri, 18 Jan 2019 18:46:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 89E7B22EC1 for ; Fri, 18 Jan 2019 18:46:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3hm3TCf2S-F7 for ; Fri, 18 Jan 2019 18:46:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.com.br (mx.datacom.ind.br [177.66.5.10]) by silver.osuosl.org (Postfix) with ESMTPS id C259B22920 for ; Fri, 18 Jan 2019 18:46:33 +0000 (UTC) Received: from mail.datacom.com.br (localhost [127.0.0.1]) by mail.datacom.com.br (Postfix) with ESMTPS id 198551BA2DAE; Fri, 18 Jan 2019 16:46:43 -0200 (-02) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.com.br (Postfix) with ESMTP id 0D1E81BA2D66; Fri, 18 Jan 2019 16:46:43 -0200 (-02) Received: from mail.datacom.com.br ([127.0.0.1]) by localhost (mail.datacom.com.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id x22vRS77cdEG; Fri, 18 Jan 2019 16:46:43 -0200 (-02) Received: from pedeld202344.datacom.net (pedeld202344.datacom.net [10.0.120.87]) by mail.datacom.com.br (Postfix) with ESMTPSA id E09D31BA2B7A; Fri, 18 Jan 2019 16:46:42 -0200 (-02) From: Carlos Santos To: buildroot@buildroot.org Date: Fri, 18 Jan 2019 16:46:25 -0200 Message-Id: <20190118184625.11484-1-casantos@datacom.com.br> X-Mailer: git-send-email 2.14.5 Subject: [Buildroot] [PATCH] package/syslog-ng: fix startup with systemd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" By default syslog-ng installs a .service that requires a config file at /etc/default, so provide one with the default values. It's also necessary to enable the service by means of a symlink created at /etc/systemd/system/multi-user.target.wants. Signed-off-by: Carlos Santos Reviewed-by: Chris Packham --- package/syslog-ng/syslog-ng.mk | 10 ++++++++++ package/syslog-ng/syslog-ng@default | 8 ++++++++ 2 files changed, 18 insertions(+) create mode 100644 package/syslog-ng/syslog-ng@default diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index ecde9e8181..0c92b091b4 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -97,6 +97,16 @@ define SYSLOG_NG_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S01syslog-ng 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 +endef + # By default syslog-ng installs a number of sample configuration # files. Some of these rely on optional features being # enabled. Because of this buildroot uninstalls the shipped config diff --git a/package/syslog-ng/syslog-ng@default b/package/syslog-ng/syslog-ng@default new file mode 100644 index 0000000000..0fad00ebac --- /dev/null +++ b/package/syslog-ng/syslog-ng@default @@ -0,0 +1,8 @@ +# +# /etc/default/syslog-ng@default +# +CONFIG_FILE=/etc/syslog-ng.conf +PERSIST_FILE=/var/run/syslog-ng.persist +CONTROL_FILE=/var/run/syslog-ng.ctl +PID_FILE=/var/run/syslog-ng.pid +OTHER_OPTIONS="--enable-core"