From patchwork Thu Dec 12 07:53:58 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: 1208201 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.138; helo=whitealder.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="WGof87xM"; dkim-atps=neutral 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 47YR0P0ggmz9sNH for ; Thu, 12 Dec 2019 18:54:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73CB688254; Thu, 12 Dec 2019 07:54:40 +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 mXSqyuPrIeog; Thu, 12 Dec 2019 07:54:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8443E88220; Thu, 12 Dec 2019 07:54:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E27261BF9BA for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B32386F24 for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9UiQvuiFZXlM for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6342F848AA for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t14so1327638wmi.5 for ; Wed, 11 Dec 2019 23:54:13 -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=WGof87xMQNxHUMBL6PMU9+9FqMBQt+kXirV/CA3yzT3hO9qJA+PzJLRNzAOdtFYIPk 5ZebQbsHUs6SyDMOjyxtrmT0ueGf9fYri3ll/rdc7OkY5DdibLUVIjkhXEwfMeEPD3uc Iog1swljFDCR+/Ej/CVdXX2rmZPb3lo5BDSdZzDcJPcG6eWfhH/QYmacbgC5ckR8tSSc fcHxZGRvuMWkdoO9QANTQahPJuJxoj0x5luAfAMg5NQ6A3RLSEnD3nB+kCGM52umoJbH 4tCWifX6ya2MGg3qRgtoT+aTTtgUN74gjUAAd/3e28fJsnCAietaPER2BYCisoM2XsiM aosQ== 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=fSPtAo9LgRdmo1KbJoOZosgM1vSE+tqmS/duTCyJfLs5ppmwTxFrMtRMK+vMXXqeNR 8DEIMNJquHLCgTqYELbUXr9VGyQ7CqeO7HPj5tWKkEUqPElQCgrWXaoPb4DpOyf0lXki wzBUAozhWPl5k9gasLQLXbO+DQCMWeq1aattROSJPH/O1atdJrrWhv0t+y44kxOvMcQq 6DIIjYgkIegDQxZe0Tf7jSdUqQ5ELM/i2n49sAyRqDXNziZCTik3/ao8Ddh9Mea5/NOR /yaM3SrZ9SsZoeSMH6RSCPRrFHlD4TND5EC/HHEtZu1vkBXzCSAOt7ulegIrcrcEnm/f cLJg== X-Gm-Message-State: APjAAAVXDZlOdsGQD9ttIKf7lsrjskqMgnos/FpOWEzTuNuBeNYA5Tne XMlLGoNEI+FaHcVT6YovMJZHV315mw== X-Google-Smtp-Source: APXvYqwie5pYTgQIpmFcVDBwrZYFrW8WKfNs0aI9sbvIkqdcqs3JLW6bD4owSkCSbdO5y6cpOb1CsA== X-Received: by 2002:a1c:6755:: with SMTP id b82mr4775228wmc.126.1576137251533; Wed, 11 Dec 2019 23:54:11 -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 y20sm4909753wmi.25.2019.12.11.23.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:11 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:58 +0100 Message-Id: <20191212075400.1499536-12-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 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