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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4F8313832E for ; Sat, 30 Jul 2016 15:46:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1581421C081; Sat, 30 Jul 2016 15:46:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C8ED21C081 for ; Sat, 30 Jul 2016 15:46:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14450340CEA for ; Sat, 30 Jul 2016 15:46:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 804458DE for ; Sat, 30 Jul 2016 15:46:42 +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: <1469893594.f7b360c6da771f540d58fa6d83fb718c47be9e6d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: f7b360c6da771f540d58fa6d83fb718c47be9e6d X-VCS-Branch: master Date: Sat, 30 Jul 2016 15:46:42 +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-Archives-Salt: ce1d0879-360f-42b9-89ad-49127aa7e54a X-Archives-Hash: b7902c4b7656751498e19dc62d2733fe commit: f7b360c6da771f540d58fa6d83fb718c47be9e6d Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 30 14:53:55 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 30 15:46:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b360c6 sys-apps/systemd: drop migrate_net_name_slot sys-apps/systemd/systemd-9999.ebuild | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index b0e8183..a6151d1 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -400,34 +400,6 @@ migrate_locale() { fi } -migrate_net_name_slot() { - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${EROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ -e ${net_setup_link} ]]; then - net_move=no - elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then - net_move=yes - elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? || FAIL=1 - fi -} - reenable_unit() { if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then ebegin "Re-enabling $1" @@ -467,9 +439,6 @@ pkg_postinst() { # between OpenRC & systemd migrate_locale - # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules - migrate_net_name_slot - # Re-enable systemd-networkd for socket activation reenable_unit systemd-networkd.service