| 1 |
ssuominen 14/03/02 14:04:52 |
| 2 |
|
| 3 |
Modified: udev-9999.ebuild udev-210.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Create /etc/udev/rules.d/80-net-setup-link.rules if user has empty /etc/udev/rules.d/80-net-name-slot.rules or it's a symlink to /dev/null wrt #503140 by Jorge Manuel B. S. Vicetto |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.276 sys-fs/udev/udev-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.276&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.276&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.275&r2=1.276 |
| 15 |
|
| 16 |
Index: udev-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v |
| 19 |
retrieving revision 1.275 |
| 20 |
retrieving revision 1.276 |
| 21 |
diff -u -r1.275 -r1.276 |
| 22 |
--- udev-9999.ebuild 1 Mar 2014 09:27:37 -0000 1.275 |
| 23 |
+++ udev-9999.ebuild 2 Mar 2014 14:04:51 -0000 1.276 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.275 2014/03/01 09:27:37 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.276 2014/03/02 14:04:51 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -471,6 +471,33 @@ |
| 33 |
elog "http://wiki.gentoo.org/wiki/Udev" |
| 34 |
elog "http://wiki.gentoo.org/wiki/Udev/upgrade" |
| 35 |
|
| 36 |
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, |
| 37 |
+ # do the same for 80-net-setup-link.rules to keep the old behavior |
| 38 |
+ local net_move=no |
| 39 |
+ local net_name_slot_sym=no |
| 40 |
+ local net_rules_path="${ROOT}"/etc/udev/rules.d |
| 41 |
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
| 42 |
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
| 43 |
+ if [[ -e ${net_setup_link} ]]; then |
| 44 |
+ net_move=no |
| 45 |
+ else |
| 46 |
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes |
| 47 |
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then |
| 48 |
+ net_move=yes |
| 49 |
+ net_name_slot_sym=yes |
| 50 |
+ fi |
| 51 |
+ fi |
| 52 |
+ if [[ ${net_move} == yes ]]; then |
| 53 |
+ ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}" |
| 54 |
+ |
| 55 |
+ if [[ ${net_name_slot_sym} == yes ]]; then |
| 56 |
+ ln -nfs /dev/null "${net_setup_link}" |
| 57 |
+ else |
| 58 |
+ cp "${net_name_slot}" "${net_setup_link}" |
| 59 |
+ fi |
| 60 |
+ eend $? |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
# Update hwdb database in case the format is changed by udev version. |
| 64 |
if has_version 'sys-apps/hwids[udev]'; then |
| 65 |
udevadm hwdb --update --root="${ROOT%/}" |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.7 sys-fs/udev/udev-210.ebuild |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?rev=1.7&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?rev=1.7&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-210.ebuild?r1=1.6&r2=1.7 |
| 74 |
|
| 75 |
Index: udev-210.ebuild |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v |
| 78 |
retrieving revision 1.6 |
| 79 |
retrieving revision 1.7 |
| 80 |
diff -u -r1.6 -r1.7 |
| 81 |
--- udev-210.ebuild 1 Mar 2014 09:27:37 -0000 1.6 |
| 82 |
+++ udev-210.ebuild 2 Mar 2014 14:04:51 -0000 1.7 |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
# Copyright 1999-2014 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.6 2014/03/01 09:27:37 ssuominen Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.7 2014/03/02 14:04:51 ssuominen Exp $ |
| 88 |
|
| 89 |
EAPI=5 |
| 90 |
|
| 91 |
@@ -470,6 +470,33 @@ |
| 92 |
elog "http://wiki.gentoo.org/wiki/Udev" |
| 93 |
elog "http://wiki.gentoo.org/wiki/Udev/upgrade" |
| 94 |
|
| 95 |
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, |
| 96 |
+ # do the same for 80-net-setup-link.rules to keep the old behavior |
| 97 |
+ local net_move=no |
| 98 |
+ local net_name_slot_sym=no |
| 99 |
+ local net_rules_path="${ROOT}"/etc/udev/rules.d |
| 100 |
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules |
| 101 |
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules |
| 102 |
+ if [[ -e ${net_setup_link} ]]; then |
| 103 |
+ net_move=no |
| 104 |
+ else |
| 105 |
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes |
| 106 |
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then |
| 107 |
+ net_move=yes |
| 108 |
+ net_name_slot_sym=yes |
| 109 |
+ fi |
| 110 |
+ fi |
| 111 |
+ if [[ ${net_move} == yes ]]; then |
| 112 |
+ ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}" |
| 113 |
+ |
| 114 |
+ if [[ ${net_name_slot_sym} == yes ]]; then |
| 115 |
+ ln -nfs /dev/null "${net_setup_link}" |
| 116 |
+ else |
| 117 |
+ cp "${net_name_slot}" "${net_setup_link}" |
| 118 |
+ fi |
| 119 |
+ eend $? |
| 120 |
+ fi |
| 121 |
+ |
| 122 |
# Update hwdb database in case the format is changed by udev version. |
| 123 |
if has_version 'sys-apps/hwids[udev]'; then |
| 124 |
udevadm hwdb --update --root="${ROOT%/}" |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
1.1002 sys-fs/udev/ChangeLog |
| 129 |
|
| 130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1002&view=markup |
| 131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1002&content-type=text/plain |
| 132 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1001&r2=1.1002 |
| 133 |
|
| 134 |
Index: ChangeLog |
| 135 |
=================================================================== |
| 136 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v |
| 137 |
retrieving revision 1.1001 |
| 138 |
retrieving revision 1.1002 |
| 139 |
diff -u -r1.1001 -r1.1002 |
| 140 |
--- ChangeLog 1 Mar 2014 09:27:37 -0000 1.1001 |
| 141 |
+++ ChangeLog 2 Mar 2014 14:04:51 -0000 1.1002 |
| 142 |
@@ -1,6 +1,12 @@ |
| 143 |
# ChangeLog for sys-fs/udev |
| 144 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 145 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1001 2014/03/01 09:27:37 ssuominen Exp $ |
| 146 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1002 2014/03/02 14:04:51 ssuominen Exp $ |
| 147 |
+ |
| 148 |
+ 02 Mar 2014; Samuli Suominen <ssuominen@g.o> udev-210.ebuild, |
| 149 |
+ udev-9999.ebuild: |
| 150 |
+ Create /etc/udev/rules.d/80-net-setup-link.rules if user has empty |
| 151 |
+ /etc/udev/rules.d/80-net-name-slot.rules or it's a symlink to /dev/null wrt |
| 152 |
+ #503140 by Jorge Manuel B. S. Vicetto |
| 153 |
|
| 154 |
01 Mar 2014; Samuli Suominen <ssuominen@g.o> udev-210.ebuild, |
| 155 |
udev-9999.ebuild: |
Archives