From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 04 Mar 2026 13:14:28 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vxl7T-007yn9-1g for lore@lore.pengutronix.de; Wed, 04 Mar 2026 13:14:28 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vxl7U-0003ic-9d; Wed, 04 Mar 2026 13:14:28 +0100 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1vxl7N-0003iT-Ka for ptxdist@pengutronix.de; Wed, 04 Mar 2026 13:14:22 +0100 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-3870d178a9aso110493341fa.0 for ; Wed, 04 Mar 2026 04:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772626461; x=1773231261; darn=pengutronix.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xQgSSj2b/uB4aYLJEYc4iZK8IzlMk9XFXokcrQ1QECc=; b=jI2QzSSua6ObD/n6R2MHE73cFwAYNgGTshUUCiSXe6Iy5J/y0Yht2SRiYnarl92AG2 atCGvc8roQhCl8/pd4QMfD7ga1Kyo4TiwUNiV1tPiQPGQvlTSUHT4R2ClVSOpu37Fhpf 2ib7ZcdBA/96RJDAJx80pgnkUqWTuLfZXTTvM7Ew+Wnfqu3TpFdxYuJ8C9/832NIRQBd 2TU1TF7oQel4gZcvag4Sy+lm+MB3JWVEBBQpIziSdFe3Zqolu0t4Fe7btA9b10UFp7Vh NoGBCC++lWEUsAf+VnSV9yOnx+KcNBZfgrF+Fhk838pcMRpsbqvT5rrshyv4oH8yZ9ov /69w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772626461; x=1773231261; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xQgSSj2b/uB4aYLJEYc4iZK8IzlMk9XFXokcrQ1QECc=; b=OOl695hOIsEg2IfKPYQ3a9jzkyHOfNBUGy+ap3Y2BJD7WZz4nvdR6kfVq3HaaS3y9I z9p4Ha5WliYGDII+PHhxdWi958E03jHLCxFJZFmptlW0gEedOQjqzSt+eeCHIDjVSKnr w37KKq/yq6XlKR41UW8V3caSf4Sc51SNFRLvsVLsarhFYbK0MtLWPSXHfB93mdm6nIDD qQGBdnWeqUCajk/ONgH7VzFtAxRDJKMPFy1aPIOhjsmjd00Mx9H/Kr2uWb7yykBHufWc 8TuePy8Os4eFn2zHhiTeMNqOhpQAYhccOOl0H8ty7xlbIJ++OeuQ0nZuzgGtBoBxKQUE 3M2Q== X-Gm-Message-State: AOJu0YyXP6HPWu1VwgwwYqyJ1+VTuC54sbYHYRRfSXzBa7o1I+HffoGE jgIayU0k4RFql0p8V3TCcMXYmzjoki+aK6KIna5RSJhsNjCqGDG2OdRKCGdaJA== X-Gm-Gg: ATEYQzyOCoHTm73rVufvLAOBJT42eUlDZ5fnvcs+ZYGFh8iJK3XuyChRATxPCl5DR1t XY2Us57F1tOGplDEJyQ63WRlD91rS0H0512/+s067Cp/ddu/EVDy2uofjVHVtPJKjaUJEYLWjSU Xbve+SkGI3UAsVMWxHooNO7cw1XX1I4IzeTCA2T3cQ6PgZkamWc2FRSDLIIuAKtIOXaV0Muv02j zQAuWA/+L0OXUlvV14+zOhZeM6wdokHYbG63Xupt399oUX64vHOXCHNuJEPKqMomWJwlGnAD0pX ZIouQL00xefkBPS56G8IWfF88/xuegELpGXjQNymt5uwues9qGqPgM1PzEez4VUU855YDB6/BqO SyEGDPu6UO3S1tV7PhsP1+QI8Iv9KQOFxqwVLKDuG4Bthfdc1SbLeM++E4y5bUhSkjiYKV3Oknv A/Tuox+lAPkSR3Bt5f X-Received: by 2002:a05:651c:19a5:b0:389:fcc6:4906 with SMTP id 38308e7fff4ca-38a2c7b94a8mr15658451fa.31.1772626460279; Wed, 04 Mar 2026 04:14:20 -0800 (PST) Received: from laped.lan ([185.181.22.18]) by smtp.googlemail.com with ESMTPSA id 38308e7fff4ca-389f3016e00sm33055661fa.36.2026.03.04.04.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 04:14:19 -0800 (PST) From: Lars Alex Pedersen To: ptxdist@pengutronix.de Date: Wed, 4 Mar 2026 13:13:56 +0100 Message-ID: <20260304121357.1713400-1-lapeddk@gmail.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 1/2] systemd: Add separate option for systemd resolved X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Alex Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Split systemd-resolved from existing SYSTEMD_NETWORK option, so NetworkManager can be used together with systemd-resolved, but without systemd-networkd. Signed-off-by: Lars Alex Pedersen --- rules/systemd.make | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/rules/systemd.make b/rules/systemd.make index e752d194e..f18084f8f 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -150,7 +150,7 @@ SYSTEMD_CONF_OPT := \ -Dnsresourced=false \ -Dnss-myhostname=true \ -Dnss-mymachines=$(call ptx/endis,PTXCONF_SYSTEMD_NSPAWN)d \ - -Dnss-resolve=$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)d \ + -Dnss-resolve=$(call ptx/endis,PTXCONF_SYSTEMD_RESOLVED)d \ -Dnss-systemd=true \ -Dntp-servers= \ -Dok-color=green \ @@ -172,7 +172,7 @@ SYSTEMD_CONF_OPT := \ -Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \ -Dremote=$(call ptx/endis,PTXCONF_SYSTEMD_JOURNAL_REMOTE)d \ -Drepart=$(call ptx/endis,PTXCONF_SYSTEMD_REPART)d \ - -Dresolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \ + -Dresolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_RESOLVED) \ -Drfkill=false \ -Dseccomp=$(call ptx/endis,PTXCONF_SYSTEMD_SECCOMP)d \ -Dselinux=$(call ptx/endis,PTXCONF_GLOBAL_SELINUX)d \ @@ -280,7 +280,7 @@ SYSTEMD_HELPER := \ $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \ systemd-remount-fs \ systemd-reply-password \ - $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolved) \ + $(call ptx/ifdef, PTXCONF_SYSTEMD_RESOLVED,systemd-resolved) \ systemd-shutdown \ systemd-sleep \ systemd-socket-proxyd \ @@ -483,23 +483,13 @@ endif ifdef PTXCONF_SYSTEMD_NETWORK @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/networkctl) - @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/resolvectl) - @$(call install_link, systemd, resolvectl, /usr/bin/systemd-resolve) - @$(call install_link, systemd, ../bin/resolvectl, /usr/sbin/resolvconf) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/lib/systemd/systemd-network-generator) - @$(call install_lib, systemd, 0, 0, 0644, libnss_resolve) - @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/systemd/resolv.conf) - @$(call install_alternative, systemd, 0, 0, 0644, \ - /etc/systemd/resolved.conf) - @$(call install_link, systemd, ../systemd-resolved.service, \ - /usr/lib/systemd/system/multi-user.target.wants/systemd-resolved.service) @$(call install_link, systemd, ../systemd-networkd.service, \ /usr/lib/systemd/system/multi-user.target.wants/systemd-networkd.service) @$(call install_link, systemd, ../systemd-networkd.socket, \ /usr/lib/systemd/system/sockets.target.wants/systemd-networkd.socket) @$(call install_link, systemd, ../systemd-networkd-wait-online.service, \ /usr/lib/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service) - @$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/network) @$(call install_alternative_tree, systemd, 0, 0, /usr/lib/systemd/network) else @@ -507,6 +497,18 @@ else /usr/lib/systemd/network/99-default.link) endif +ifdef PTXCONF_SYSTEMD_RESOLVED + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/resolvectl) + @$(call install_link, systemd, resolvectl, /usr/bin/systemd-resolve) + @$(call install_link, systemd, ../bin/resolvectl, /usr/sbin/resolvconf) + @$(call install_lib, systemd, 0, 0, 0644, libnss_resolve) + @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/systemd/resolv.conf) + @$(call install_alternative, systemd, 0, 0, 0644, \ + /etc/systemd/resolved.conf) + @$(call install_link, systemd, ../systemd-resolved.service, \ + /usr/lib/systemd/system/multi-user.target.wants/systemd-resolved.service) +endif + ifdef PTXCONF_SYSTEMD_POLKIT @$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1) endif base-commit: 938919627b16d7e2a9558ce1316fb4e42245479c -- 2.53.0