summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-01-28 23:14:11 +0000
committerMike Frysinger <vapier@gentoo.org>2007-01-28 23:14:11 +0000
commite6b4b7661bb86d55c779d360539dadd4d3be3f0d (patch)
tree27d7615710700f1562104016222795b86cc00457 /sys-fs/udev
parentFixed issue with examples not being compiled and/or complete. Thanks to nostr... (diff)
downloadgentoo-2-e6b4b7661bb86d55c779d360539dadd4d3be3f0d.tar.gz
gentoo-2-e6b4b7661bb86d55c779d360539dadd4d3be3f0d.tar.bz2
gentoo-2-e6b4b7661bb86d55c779d360539dadd4d3be3f0d.zip
Only screw with udevd when ROOT == /.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'sys-fs/udev')
-rw-r--r--sys-fs/udev/ChangeLog6
-rw-r--r--sys-fs/udev/udev-103.ebuild15
-rw-r--r--sys-fs/udev/udev-104-r3.ebuild15
-rw-r--r--sys-fs/udev/udev-104-r4.ebuild15
4 files changed, 29 insertions, 22 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 105335495a0d..744cda850c94 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.233 2007/01/27 12:27:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.234 2007/01/28 23:14:11 vapier Exp $
+
+ 28 Jan 2007; Mike Frysinger <vapier@gentoo.org> udev-103.ebuild,
+ udev-104-r3.ebuild, udev-104-r4.ebuild:
+ Only screw with udevd when ROOT == /.
*udev-104-r4 (27 Jan 2007)
diff --git a/sys-fs/udev/udev-103.ebuild b/sys-fs/udev/udev-103.ebuild
index c5971c7d4902..bf6a5e136e17 100644
--- a/sys-fs/udev/udev-103.ebuild
+++ b/sys-fs/udev/udev-103.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-103.ebuild,v 1.8 2007/01/26 13:59:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-103.ebuild,v 1.9 2007/01/28 23:14:11 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -256,13 +256,14 @@ pkg_preinst() {
}
pkg_postinst() {
- if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
- then
- killall -15 udevd &>/dev/null
- sleep 1
- killall -9 udevd &>/dev/null
+ if [[ ${ROOT} == "/" ]] ; then
+ if [[ -n $(pidof udevd) ]] ; then
+ killall -15 udevd &>/dev/null
+ sleep 1
+ killall -9 udevd &>/dev/null
+ fi
+ /sbin/udevd --daemon
fi
- /sbin/udevd --daemon
# people want reminders, I'll give them reminders. Odds are they will
# just ignore them anyway...
diff --git a/sys-fs/udev/udev-104-r3.ebuild b/sys-fs/udev/udev-104-r3.ebuild
index 361b3aed525b..49eefb22800a 100644
--- a/sys-fs/udev/udev-104-r3.ebuild
+++ b/sys-fs/udev/udev-104-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r3.ebuild,v 1.3 2007/01/27 11:26:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r3.ebuild,v 1.4 2007/01/28 23:14:11 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -231,13 +231,14 @@ pkg_preinst() {
}
pkg_postinst() {
- if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
- then
- killall -15 udevd &>/dev/null
- sleep 1
- killall -9 udevd &>/dev/null
+ if [[ ${ROOT} == "/" ]] ; then
+ if [[ -n $(pidof udevd) ]] ; then
+ killall -15 udevd &>/dev/null
+ sleep 1
+ killall -9 udevd &>/dev/null
+ fi
+ /sbin/udevd --daemon
fi
- /sbin/udevd --daemon
# people want reminders, I'll give them reminders. Odds are they will
# just ignore them anyway...
diff --git a/sys-fs/udev/udev-104-r4.ebuild b/sys-fs/udev/udev-104-r4.ebuild
index 30d769557bc6..c94a1b013e82 100644
--- a/sys-fs/udev/udev-104-r4.ebuild
+++ b/sys-fs/udev/udev-104-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r4.ebuild,v 1.1 2007/01/27 12:27:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r4.ebuild,v 1.2 2007/01/28 23:14:11 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -231,13 +231,14 @@ pkg_preinst() {
}
pkg_postinst() {
- if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
- then
- killall -15 udevd &>/dev/null
- sleep 1
- killall -9 udevd &>/dev/null
+ if [[ ${ROOT} == "/" ]] ; then
+ if [[ -n $(pidof udevd) ]] ; then
+ killall -15 udevd &>/dev/null
+ sleep 1
+ killall -9 udevd &>/dev/null
+ fi
+ /sbin/udevd --daemon
fi
- /sbin/udevd --daemon
# people want reminders, I'll give them reminders. Odds are they will
# just ignore them anyway...