From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=ham autolearn_force=no version=3.4.1 Date: Sat, 4 Dec 2021 22:14:34 +0100 From: Konstantin Lepikhov To: devel-distro@lists.altlinux.org Message-ID: Mail-Followup-To: devel-distro@lists.altlinux.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="yTiz+3OLQ/SQwZTB" Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Operation-System: ALT Sisyphus Sisyphus (unstable) (sisyphus) 5.10.0-lks-wks-alt13 User-Agent: Mutt/2.1.1.0.3.g6c0f75cca (2021-07-12) Subject: [devel-distro] dhcp4 only for use/net-eth X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2021 21:14:37 -0000 Archived-At: List-Archive: --yTiz+3OLQ/SQwZTB Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Привет! Иногда бывает полезно запретить networkd проявлять сообразительность и пытаться конфигурировать сеть для всех протоколов. Для таких случаев сделал dhcp4 вариант, который настраивает только ipv4 dhcp и запрещает ipv6. -- WBR et al. --yTiz+3OLQ/SQwZTB Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0093-use-net-eth-add-dhcp-ipv4-only-support-for-networkd.patch" >>From 5a1ca2562f630821f768c8cdf1072388a3ab55da Mon Sep 17 00:00:00 2001 From: "Konstantin A. Lepikhov" Date: Sat, 4 Dec 2021 14:52:57 +0100 Subject: [PATCH 93/94] use/net-eth: add dhcp ipv4 only support for networkd --- features.in/net-eth/config.mk | 3 +++ .../net-eth/rootfs/image-scripts.d/50-net-eth | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/features.in/net-eth/config.mk b/features.in/net-eth/config.mk index dafd3a7f..6fa0b4df 100644 --- a/features.in/net-eth/config.mk +++ b/features.in/net-eth/config.mk @@ -25,4 +25,7 @@ use/net-eth/dhcp/timeout/%: use/net-eth/dhcp use/net-eth/networkd-dhcp: use/net-eth/networkd @$(call add,NET_ETH,eth0:dhcp) +use/net-eth/networkd-dhcp4: use/net-eth/networkd + @$(call add,NET_ETH,eth0:dhcp4) + # use e.g. eth0:static:10.0.0.2/24:10.0.0.1 for predefined static configuration diff --git a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth index 92bde492..51c12b29 100755 --- a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth +++ b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth @@ -22,7 +22,7 @@ SYSTEMD_IFDIR="/etc/systemd/network" write_iface() { case "$proto" in - dhcp) + dhcp*) ;; static) [ -n "$ipv4addr" ] || fatal "ipv4addr missing" @@ -41,7 +41,7 @@ write_etcnet_iface() { mkdir -p "$dir" append= case "$proto" in - dhcp) + dhcp*) append="DHCP_TIMEOUT=$GLOBAL_NET_ETH_TIMEOUT" ;; static) @@ -62,6 +62,21 @@ write_etcnet_iface() { write_systemd_iface() { case "$proto" in + dhcp4) + echo "[Match]" + echo "Name=$iface" + echo + echo "[Network]" + echo "DHCP=ipv4" + echo "IPv6AcceptRA=no" + echo "LinkLocalAddressing=ipv4" + echo + echo "[DHCP]" + echo "UseMTU=yes" + echo "UseDomains=yes" + echo "UseNTP=yes" + echo + ;; dhcp) echo "[Match]" echo "Name=$iface" -- 2.33.0 --yTiz+3OLQ/SQwZTB--