From patchwork Mon Dec 16 10:30:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1210226 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="bPqVzG46"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHP4GWKz9sRc for ; Mon, 16 Dec 2019 21:31:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A8BAD87C11; Mon, 16 Dec 2019 10:31:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2LWyjTXe1KPP; Mon, 16 Dec 2019 10:31:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1821D87C20; Mon, 16 Dec 2019 10:31:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C0A8A1BF2B5 for ; Mon, 16 Dec 2019 10:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B535A86FA6 for ; Mon, 16 Dec 2019 10:31:14 +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 aYQhpVJhfPZe for ; Mon, 16 Dec 2019 10:31:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2AE578704C for ; Mon, 16 Dec 2019 10:31:10 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id b6so6607022wrq.0 for ; Mon, 16 Dec 2019 02:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RfGdAcXQUhDOr7OvrvxKM74ftVgLRA7XDl4kAJw5c3k=; b=bPqVzG46Z3q6Ht62a+zK2x7fchuaCiEHfmTxd+9+pP11GM0ra3BB7ruSCCB96PgBVV nb3RB6/bhOIBOA2a7PRZmIA2eXrBu7igTpM7EIqLtrspfSaz9CIWj/fny5vZWGPNwgXP YHuxJf0s42rFHRfqniDLofPPbtvzH9G6fFsjKvLXYZGKtZsL/2q4RriEHfXHZsudIOqS mO9O59yMam3nNK1raxNn5LppB5A+FPwzNdtweoUrAOwMBCzo38aDwDBL0ZewbVvhQI5p b5M8qB0FELkC1NiI/FJx4JIsA4ANCaQ0hffyh/Y+/1HBYmE+XQq9sAXwldvMG4t7nfrm 0HhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RfGdAcXQUhDOr7OvrvxKM74ftVgLRA7XDl4kAJw5c3k=; b=YGdpVmQRpqZSlQKDzPp2iDMt6iZf8aDbiE2CAxbxMYPxW6X4kwdmuCEeWLMRslFMkT /TgsORDmc+yWsJMWi+0/JvKBcz26l6AS8Xg/9ac0MXC7wdR8zXBBBnmXdebbzv/C4gNO TbAmK54ttFGERaLmC28fanIws25b4VuW495ad0Kr4qtJwYaBZmQp6QL8reMAzhPuI+dl A9zQFoDL1HJtq6VH06KiBXHGv1vCsp8uSvxuSSBfz/OkIEE8ISbzFQ2HxySxzhmQtwBc MXFFXCulqEp+i7A+GVcBVDULHcINoAVr7FlCwWdvQvyeDaysfhs7RIwbhAhBqNdDtVh9 HGHA== X-Gm-Message-State: APjAAAVaJlMIHrsf+85XO47syb8dJW75vv76oCmPyQAHTcLXc42yhcIp ax7fklTxe/i2moCW6E7+cKc61aqPSg== X-Google-Smtp-Source: APXvYqxtiMz2TinTpyBl8pPbORpYs/UmXL3tJTkkXUD3tEqFW1+0kPbNB5oo0XIIWOh9yOP/5AH5Gw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr28660542wrt.169.1576492268447; Mon, 16 Dec 2019 02:31:08 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:07 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:50 +0100 Message-Id: <20191216103052.35220-12-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 11/13] package/syslog-ng: implement systemd enablement using DefaultInstance 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: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/syslog-ng/syslog-ng.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index fc44777d16..98b5a38deb 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -105,11 +105,8 @@ 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