diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-05-12 17:46:47 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-05-12 17:46:47 +0000 |
| commit | 244e5959a1931dad3db55fb36af0934d77f408ed (patch) | |
| tree | 02020081cd0bc545ec15a00397ee14d197d0d9ca /sys-fs | |
| parent | Initial ebuild for aufs2 (diff) | |
| download | gentoo-2-244e5959a1931dad3db55fb36af0934d77f408ed.tar.gz gentoo-2-244e5959a1931dad3db55fb36af0934d77f408ed.tar.bz2 gentoo-2-244e5959a1931dad3db55fb36af0934d77f408ed.zip | |
Fix config file renaming if user had changes. Bug #269392.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-124-r2.ebuild | 11 | ||||
| -rw-r--r-- | sys-fs/udev/udev-141.ebuild | 11 |
3 files changed, 25 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 357928be19e3..c6e971bb5c5f 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.466 2009/05/06 23:52:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.467 2009/05/12 17:46:47 zzam Exp $ + + 12 May 2009; Matthias Schwarzott <zzam@gentoo.org> udev-124-r2.ebuild, + udev-141.ebuild: + Fix config file renaming if user had changes. Bug #269392. 06 May 2009; Mike Frysinger <vapier@gentoo.org> udev-114.ebuild, udev-115-r1.ebuild, udev-119.ebuild, udev-124-r1.ebuild, diff --git a/sys-fs/udev/udev-124-r2.ebuild b/sys-fs/udev/udev-124-r2.ebuild index 5aaf21c19c09..bd61485ea4a6 100644 --- a/sys-fs/udev/udev-124-r2.ebuild +++ b/sys-fs/udev/udev-124-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r2.ebuild,v 1.8 2009/05/06 23:52:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r2.ebuild,v 1.9 2009/05/12 17:46:47 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs versionator @@ -223,6 +223,15 @@ src_install() { } pkg_preinst() { + local f dir=${ROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + if [[ -d ${ROOT}/lib/udev-state ]] then mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ diff --git a/sys-fs/udev/udev-141.ebuild b/sys-fs/udev/udev-141.ebuild index b528a6087b5d..5a296c1c9370 100644 --- a/sys-fs/udev/udev-141.ebuild +++ b/sys-fs/udev/udev-141.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.2 2009/05/06 23:52:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.3 2009/05/12 17:46:47 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs versionator @@ -241,6 +241,15 @@ src_install() { } pkg_preinst() { + local f dir=${ROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + if [[ -d ${ROOT}/lib/udev-state ]] then mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ |