diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 18:59:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-11 18:59:22 +0000 |
| commit | b1da035b3a15149aba8f35c042823457afaf1b29 (patch) | |
| tree | 29e61c205d7c251d6c68c00baa95ac86f0b730f7 /sys-apps | |
| parent | Convert to multilib (diff) | |
| download | gentoo-2-b1da035b3a15149aba8f35c042823457afaf1b29.tar.gz gentoo-2-b1da035b3a15149aba8f35c042823457afaf1b29.tar.bz2 gentoo-2-b1da035b3a15149aba8f35c042823457afaf1b29.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-apps')
| -rw-r--r-- | sys-apps/hwids/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hwids/hwids-20130717-r1.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/hwids/hwids-99999999.ebuild | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog index 8ab2054595bf..707c2de57a17 100644 --- a/sys-apps/hwids/ChangeLog +++ b/sys-apps/hwids/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/hwids # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.114 2013/08/11 17:45:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.115 2013/08/11 18:59:22 ssuominen Exp $ + + 11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> hwids-20130717-r1.ebuild, + hwids-99999999.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> hwids-20130717-r1.ebuild, hwids-99999999.ebuild: diff --git a/sys-apps/hwids/hwids-20130717-r1.ebuild b/sys-apps/hwids/hwids-20130717-r1.ebuild index 94b97dd0d30b..a2f95b337b7a 100644 --- a/sys-apps/hwids/hwids-20130717-r1.ebuild +++ b/sys-apps/hwids/hwids-20130717-r1.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-apps/hwids/hwids-20130717-r1.ebuild,v 1.2 2013/08/11 17:45:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130717-r1.ebuild,v 1.3 2013/08/11 18:59:22 ssuominen Exp $ EAPI=5 inherit udev eutils @@ -46,6 +46,9 @@ pkg_postinst() { if use 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-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild index c188df62d70a..0d24c6da4c31 100644 --- a/sys-apps/hwids/hwids-99999999.ebuild +++ b/sys-apps/hwids/hwids-99999999.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-apps/hwids/hwids-99999999.ebuild,v 1.22 2013/08/11 17:45:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.23 2013/08/11 18:59:22 ssuominen Exp $ EAPI=5 inherit udev eutils git-2 @@ -44,6 +44,9 @@ pkg_postinst() { if use 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 } |