From patchwork Sat Dec 7 18:00:47 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: 1205500 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="zDURFxbX"; 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 47VchY46WSz9sR0 for ; Sun, 8 Dec 2019 05:01:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 45C0B884B5; Sat, 7 Dec 2019 18:01:13 +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 4GEyIq9DAn4g; Sat, 7 Dec 2019 18:01:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C5B1388480; Sat, 7 Dec 2019 18:01:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 83DA01BF3BE for ; Sat, 7 Dec 2019 18:01:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 810C8883A8 for ; Sat, 7 Dec 2019 18:01:04 +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 ZWMdhLkXY1Yl for ; Sat, 7 Dec 2019 18:01:04 +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 hemlock.osuosl.org (Postfix) with ESMTPS id CE50988480 for ; Sat, 7 Dec 2019 18:01:03 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z3so11367407wru.3 for ; Sat, 07 Dec 2019 10:01:03 -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=zDURFxbX7f8PzvGy3pjK2AmwW1UvIux1z9ePieiZX8sMEhE0k4GUwGPr5Ys7BSQNQZ P7XEfkdV3pBeD7RjgFZ3JHWhfrqL9lorHzB2Zq/3gKJfbUnahbiXgb7zjElJM8hXAMIe U36cFmi87O8a1TQNJaNMkiYTidErY+7jCVRmw6tM1/DCzJ7nWoLYqfRYlMhq+St5sT7P 7RL5SNkZHrlkhRI3kuMmZTJT4eY9n3kYeH3xZyGPsRJJFN8xJGQxACBOcoVP8XlHYMSe GW03+oqKEY9peixniF5At5aVnlkL6xqEXcczYYcHjPFID/ihmVFLNUAP9JR8IcGtu55T x95A== 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=mS5PxsTh9zWnZsTSP6elJLT5bOqreA00e3GAab8fC2EJxCdgjXOEmuL79Xb0w94yRb 9zc+XFDAWXuKh5FIvpSwHLivPeeZF12Cevn2qKgdd80CVrNfLwpNSPRY3TKhYV6m6v1z ntAIQ14GnUnZ7OaQ7EA0lvlEuGH04eSqk6BSpXuAcWox7sLLTrOwavhcCX75R1Jxnh4X gHZwOH4v7YQfI6/GDH3jwLWgLs/BMjOd7m4QV7Uu7KEk1qf5tVppOxqPzKI+I/uBYFQp gU4y06IPycKKJsaVxnwwVkSQn47zikBltEmZAo6oXBE3//RGSD15y1tAjHFi2TAgpaWQ lwvQ== X-Gm-Message-State: APjAAAXd3rmbwcsKfkKFzIcmvOP0WJfH7N/sq6Zy/awycNZwZ5jUDXnS pberrSKCCp/OpG12Bit7DrpjOYjbtw== X-Google-Smtp-Source: APXvYqz6C8bFEYI7NNI+DYlFmAyVwDzyJyY6hxAETryupgkqWbsDBY1liXp6Ms1oDKNQzECnIrlDZg== X-Received: by 2002:a5d:5308:: with SMTP id e8mr22041636wrv.77.1575741662206; Sat, 07 Dec 2019 10:01:02 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id z4sm7558964wme.17.2019.12.07.10.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 10:01:01 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sat, 7 Dec 2019 19:00:47 +0100 Message-Id: <20191207180049.3245578-12-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191207180049.3245578-1-jeremy.rosen@smile.fr> References: <20191207180049.3245578-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 11/13] package/syslog-ng: implement default 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