From patchwork Sun Aug 11 19:36:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1145364 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JoUT6dw6"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4668PX61dbz9sML for ; Mon, 12 Aug 2019 05:37:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E4C6985AA1; Sun, 11 Aug 2019 19:36:59 +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 QLyEz_Ok4RbN; Sun, 11 Aug 2019 19:36:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 65D2685C43; Sun, 11 Aug 2019 19:36:59 +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 A4A951BF36F for ; Sun, 11 Aug 2019 19:36:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A0AB785C13 for ; Sun, 11 Aug 2019 19:36:57 +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 klaUrhlXiqJH for ; Sun, 11 Aug 2019 19:36:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1AFEC859BE for ; Sun, 11 Aug 2019 19:36:57 +0000 (UTC) Received: by mail-ot1-f66.google.com with SMTP id f17so16327414otq.4 for ; Sun, 11 Aug 2019 12:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+vcUZ/bLGxzDRefhJ5QKLyRUzP0Iuhpze+XrX+C/1o0=; b=JoUT6dw64y3xIdsyJHBlLtmZisiyzvqPwHYKYafkh7MwULZKWiDz4hYTegWEdXxQPR 7ysHGyhNYMGMEqii7uGMAxAYMXF6xv8wzRlW/+5lohDpamuEBAi4OwtYienXCAzUSTB0 ITe53GdMKz1v7mno5I8Ee0AxsAapIX1B2T+W7hR01+KjEGGV12pp53HCOTD8oeAgEQvb 1j/w8udTV2vG+7uJhUeJBR9/LZIOETUyEwIvdqZMBqRG2zVHKl+MoIXLTp1HwP8hrUi1 RcGpWr7nBI83CAFUT5kr7SNsfEb2QCA4akzjETEKzmmh+F3fpnYWokxAD+x7E3EP3PE3 2M3g== 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:mime-version :content-transfer-encoding; bh=+vcUZ/bLGxzDRefhJ5QKLyRUzP0Iuhpze+XrX+C/1o0=; b=d+S/VqEMpr7nkvlXSPBVtc2lGDLvkJs7cUhwA4V7JI0YVoTPnSO3RhmB9hyh4iUcxZ 9t3+klAGf+SXr2DMCJQuUKu6RfBFNudbJfM9oOtAom0tQcd4zKNgAcgDlw6PbYMR2C+/ kXEk6Zji0dAOWs5x5/tb3c3Z8ehfR63kbNNkn2eiKAnjZROHzsXN+ExOcVHQEWyEuIap yicMjGUS1Z2DMeuJsfhUC0wWfe9fN3Bdzfzwlfkbxn+LQbZiRRmSMLmmL0n+VCOHvZ27 SicUhFg0f899csn1OtqrK6vVSSg5utCbuln2d7qO/GjqZobpa+OCG+ejldef7R+sznyd wKgw== X-Gm-Message-State: APjAAAVm3jpFjQZEtd/RoTs0hukq6xX+0FH2pDrknD1NwcNHCSHDl6KU yAFe4rozwj8Tq/ygXOi+ih4fFgFzgDQ= X-Google-Smtp-Source: APXvYqz9GuWVo4uRoTnttzstqUvrSNQwjIueeYNUuUsCuahVtQ3Rj7bUShHiuPCYqC3vYmtwvFA4VA== X-Received: by 2002:a05:6602:c7:: with SMTP id z7mr4844978ioe.130.1565552215786; Sun, 11 Aug 2019 12:36:55 -0700 (PDT) Received: from localhost.localdomain (71-218-127-194.hlrn.qwest.net. [71.218.127.194]) by smtp.gmail.com with ESMTPSA id k24sm2594787ioj.39.2019.08.11.12.36.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 11 Aug 2019 12:36:54 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 11 Aug 2019 13:36:48 -0600 Message-Id: <20190811193648.41690-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/systemd: install resolv.conf with systemd resolve instead of networkd 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: James Hilliard , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: https://bugs.busybox.net/show_bug.cgi?id=9881 Signed-off-by: James Hilliard --- package/systemd/systemd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e8fd7967bd..bd0c9d43c8 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -310,10 +310,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager -define SYSTEMD_INSTALL_RESOLVCONF_HOOK - ln -sf ../run/systemd/resolve/resolv.conf \ - $(TARGET_DIR)/etc/resolv.conf -endef SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -329,6 +325,10 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) SYSTEMD_CONF_OPTS += -Dresolve=true SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager +define SYSTEMD_INSTALL_RESOLVCONF_HOOK + ln -sf ../run/systemd/resolve/resolv.conf \ + $(TARGET_DIR)/etc/resolv.conf +endef else SYSTEMD_CONF_OPTS += -Dresolve=false endif