diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 19:01:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 19:01:21 +0000 |
| commit | ef54d90c2d2775ae1ad64aafeb6adbee9b0fcad1 (patch) | |
| tree | 0ff1f84e9c78140c4cbf52b4eb760fca0bb91fb3 /sys-fs/udev | |
| parent | Don't reload the /etc/udev/hwdb.bin when $ROOT isn't set or when it isn't / (diff) | |
| download | gentoo-2-ef54d90c2d2775ae1ad64aafeb6adbee9b0fcad1.tar.gz gentoo-2-ef54d90c2d2775ae1ad64aafeb6adbee9b0fcad1.tar.bz2 gentoo-2-ef54d90c2d2775ae1ad64aafeb6adbee9b0fcad1.zip | |
Don't reload the /etc/udev/hwdb.bin when $ROOT isn't set or when it isn't /
(Portage version: 2.2.0_alpha196/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-206-r3.ebuild | 5 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 36d198b47e5f..e3db0dde9d4a 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.954 2013/08/11 18:29:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.955 2013/08/11 19:01:21 ssuominen Exp $ + + 11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild, + udev-9999.ebuild: + Don't reload the /etc/udev/hwdb.bin when $ROOT isn't set or when it isn't / 11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild, udev-9999.ebuild: diff --git a/sys-fs/udev/udev-206-r3.ebuild b/sys-fs/udev/udev-206-r3.ebuild index f4262da15f1c..e59760ea4342 100644 --- a/sys-fs/udev/udev-206-r3.ebuild +++ b/sys-fs/udev/udev-206-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.3 2013/08/11 18:29:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.4 2013/08/11 19:01:21 ssuominen Exp $ EAPI=5 @@ -514,6 +514,9 @@ pkg_postinst() { if has_version 'sys-apps/hwids[udev]'; then udevadm hwdb --update --root="${ROOT%/}" # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + return 0 + fi udevadm control --reload fi } diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 3d9b7193a5cf..4b84896640c0 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.249 2013/08/11 18:29:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.250 2013/08/11 19:01:21 ssuominen Exp $ EAPI=5 @@ -514,6 +514,9 @@ pkg_postinst() { if has_version 'sys-apps/hwids[udev]'; then udevadm hwdb --update --root="${ROOT%/}" # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + return 0 + fi udevadm control --reload fi } |