| 1 |
commit: f7b360c6da771f540d58fa6d83fb718c47be9e6d |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 14:53:55 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 15:46:34 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b360c6 |
| 7 |
|
| 8 |
sys-apps/systemd: drop migrate_net_name_slot |
| 9 |
|
| 10 |
sys-apps/systemd/systemd-9999.ebuild | 31 ------------------------------- |
| 11 |
1 file changed, 31 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 14 |
index b0e8183..a6151d1 100644 |
| 15 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 16 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 17 |
@@ -400,34 +400,6 @@ migrate_locale() { |
| 18 |
fi |
| 19 |
} |
| 20 |
|
| 21 |
-migrate_net_name_slot() { |
| 22 |
- # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, |
| 23 |
- # do the same for 80-net-setup-link.rules to keep the old behavior |
| 24 |
- local net_move=no |
| 25 |
- local net_name_slot_sym=no |
| 26 |
- local net_rules_path="${EROOT%/}"/etc/udev/rules.d |
| 27 |
- local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
| 28 |
- local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
| 29 |
- if [[ -e ${net_setup_link} ]]; then |
| 30 |
- net_move=no |
| 31 |
- elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then |
| 32 |
- net_move=yes |
| 33 |
- elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then |
| 34 |
- net_move=yes |
| 35 |
- net_name_slot_sym=yes |
| 36 |
- fi |
| 37 |
- if [[ ${net_move} == yes ]]; then |
| 38 |
- ebegin "Copying ${net_name_slot} to ${net_setup_link}" |
| 39 |
- |
| 40 |
- if [[ ${net_name_slot_sym} == yes ]]; then |
| 41 |
- ln -nfs /dev/null "${net_setup_link}" |
| 42 |
- else |
| 43 |
- cp "${net_name_slot}" "${net_setup_link}" |
| 44 |
- fi |
| 45 |
- eend $? || FAIL=1 |
| 46 |
- fi |
| 47 |
-} |
| 48 |
- |
| 49 |
reenable_unit() { |
| 50 |
if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then |
| 51 |
ebegin "Re-enabling $1" |
| 52 |
@@ -467,9 +439,6 @@ pkg_postinst() { |
| 53 |
# between OpenRC & systemd |
| 54 |
migrate_locale |
| 55 |
|
| 56 |
- # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules |
| 57 |
- migrate_net_name_slot |
| 58 |
- |
| 59 |
# Re-enable systemd-networkd for socket activation |
| 60 |
reenable_unit systemd-networkd.service |
Archives