From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64787158086 for ; Wed, 1 Dec 2021 20:09:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8AA72BC07A; Wed, 1 Dec 2021 20:09:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60ABF2BC07A for ; Wed, 1 Dec 2021 20:09:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 169073430EE for ; Wed, 1 Dec 2021 20:09:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6193E8E for ; Wed, 1 Dec 2021 20:09:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1638389385.511de3842159b3f3d74489e7f4acfbdb5b083971.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/udev-249.6-r1.ebuild sys-fs/udev/udev-249.6.ebuild sys-fs/udev/udev-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 511de3842159b3f3d74489e7f4acfbdb5b083971 X-VCS-Branch: master Date: Wed, 1 Dec 2021 20:09:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9cc358e-2f53-4db2-aa56-4befe84bc35d X-Archives-Hash: 4459f109ab38d6b138f17be3203c7800 commit: 511de3842159b3f3d74489e7f4acfbdb5b083971 Author: Mike Gilbert gentoo org> AuthorDate: Wed Dec 1 19:58:29 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Dec 1 20:09:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511de384 sys-fs/udev: rename 80-net-name-slot.rules when migrating from eudev Closes: https://bugs.gentoo.org/827937 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/udev-249.6-r1.ebuild | 6 ++++++ sys-fs/udev/udev-249.6.ebuild | 6 ++++++ sys-fs/udev/udev-9999.ebuild | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/sys-fs/udev/udev-249.6-r1.ebuild b/sys-fs/udev/udev-249.6-r1.ebuild index cc70f84d4598..aa9f2ad8efe6 100644 --- a/sys-fs/udev/udev-249.6-r1.ebuild +++ b/sys-fs/udev/udev-249.6-r1.ebuild @@ -299,5 +299,11 @@ pkg_postinst() { ewarn ewarn "If you wish to disable this, please see the above documentation, or set" ewarn "net.ifnames=0 on the kernel command line." + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi fi } diff --git a/sys-fs/udev/udev-249.6.ebuild b/sys-fs/udev/udev-249.6.ebuild index 99e87d5ebe55..d3c2c55adb2b 100644 --- a/sys-fs/udev/udev-249.6.ebuild +++ b/sys-fs/udev/udev-249.6.ebuild @@ -292,5 +292,11 @@ pkg_postinst() { ewarn ewarn "If you wish to disable this, please see the above documentation, or set" ewarn "net.ifnames=0 on the kernel command line." + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi fi } diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 3b56e4e1f8ea..66f6958287d3 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -299,5 +299,11 @@ pkg_postinst() { ewarn ewarn "If you wish to disable this, please see the above documentation, or set" ewarn "net.ifnames=0 on the kernel command line." + if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then + ewarn + ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" + ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" + mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules + fi fi }