From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 10 Jan 2023 16:30:38 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pFGaF-007stG-4n for lore@lore.pengutronix.de; Tue, 10 Jan 2023 16:30:38 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pFGaD-0006Ni-QX; Tue, 10 Jan 2023 16:30:37 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pFGZz-0006NJ-Gb; Tue, 10 Jan 2023 16:30:23 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pFGZy-0056kM-T2; Tue, 10 Jan 2023 16:30:22 +0100 Received: from mtr by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pFGZx-007iam-ME; Tue, 10 Jan 2023 16:30:21 +0100 From: Michael Tretter To: ptxdist@pengutronix.de Date: Tue, 10 Jan 2023 16:30:21 +0100 Message-Id: <20230110153021.1839663-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] systemd: make default-net-naming-scheme configurable 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: mtr@pengutronix.de 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.ext.pengutronix.de); SAEximRunCond expanded to false The default-net-naming-scheme parameter allows to preserve the naming scheme of a previous systemd version on a newer version. It may be necessary to preserve a naming scheme if other system components rely on certain network interface names generated by some naming scheme. The default is "latest" to use the naming scheme of the currently used systemd version. Signed-off-by: Michael Tretter --- rules/systemd.in | 8 ++++++++ rules/systemd.make | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rules/systemd.in b/rules/systemd.in index 0818bf535866..17997574b62e 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -158,6 +158,14 @@ config SYSTEMD_NSPAWN bool prompt "install systemd-nspawn" +config SYSTEMD_DEFAULT_NET_NAMING_SCHEME + string + prompt "default net.naming-scheme= value" + default "latest" + help + Preserve the naming scheme for network interfaces of the given + systemd version. + menu "journald " config SYSTEMD_XZ diff --git a/rules/systemd.make b/rules/systemd.make index e5a6b26a5c55..69b044bb8123 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -78,7 +78,7 @@ SYSTEMD_CONF_OPT := \ -Ddefault-llmnr=yes \ -Ddefault-locale=C \ -Ddefault-mdns=yes \ - -Ddefault-net-naming-scheme=latest \ + -Ddefault-net-naming-scheme=$(call remove_quotes,$(PTXCONF_SYSTEMD_DEFAULT_NET_NAMING_SCHEME)) \ -Ddev-kvm-mode=0660 \ -Ddns-over-tls=false \ -Ddns-servers= \ -- 2.30.2