diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 21:01:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 21:01:41 +0000 |
| commit | a81e105bb317e30bc0a471baafd0035b92dfd774 (patch) | |
| tree | 21f8fa31ce028de162b8a74821b7221e2528be82 /sys-fs/udev | |
| parent | Revbump to add two more missing patches that were in 1.5.22 (diff) | |
| download | gentoo-2-a81e105bb317e30bc0a471baafd0035b92dfd774.tar.gz gentoo-2-a81e105bb317e30bc0a471baafd0035b92dfd774.tar.bz2 gentoo-2-a81e105bb317e30bc0a471baafd0035b92dfd774.zip | |
Finetune the 80-net-name-slot.rules migration code a bit and remove unnecessary "then" since net_move=no is already declared above.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs/udev')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index be75b4cbbe0d..8119925f4691 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1023 2014/04/05 20:28:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1024 2014/04/08 21:01:41 ssuominen Exp $ + + 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild: + Finetune the 80-net-name-slot.rules migration code a bit and remove + unnecessary "then" since net_move=no is already declared above. 05 Apr 2014; Jeroen Roovers <jer@gentoo.org> udev-212-r1.ebuild: Stable for HPPA (bug #505962). diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 0707d0e42153..1b91c32b002b 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.293 2014/04/03 19:34:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.294 2014/04/08 21:01:41 ssuominen Exp $ EAPI=5 @@ -481,9 +481,7 @@ pkg_postinst() { local net_rules_path="${ROOT%/}"/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 - else + if [[ ! -e ${net_setup_link} ]]; then [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then net_move=yes |