Do not restart udevd if it was not running before, Bug #234669.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 17 insertions, 11 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 19d2ae94c2b2..545e98b363e2 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.478 2009/07/16 07:40:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.479 2009/07/16 08:46:22 zzam Exp $
+
+  16 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> udev-124-r1.ebuild,
+  udev-124-r2.ebuild:
+  Do not restart udevd if it was not running before, Bug #234669.
 
   16 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> -udev-143.ebuild,
   -udev-144.ebuild, udev-145.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 84db8d3e03d6..de23a65ca51e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -51,18 +51,18 @@ DIST udev-145.tar.bz2 529739 RMD160 7291e0d75fe2278a6820c7cc671e8757d209ec52 SHA
 EBUILD udev-114.ebuild 9053 RMD160 71cf9942c2680b37cde18fb1e6b45661863add68 SHA1 a61fd58682ed8e206468f15f35c718a838f6b2c7 SHA256 fa7bf704f3406c70bc55e1e9c9995d487266707d3c93e9ea7c44844e9fbee493
 EBUILD udev-115-r1.ebuild 10130 RMD160 499b32c67f89eca774a1335b00e1c067747d453a SHA1 93ebcd32a7e1a10409464fed8e23e1bd3e8a6d24 SHA256 ce4c791c230e3430783efc180da8dce72104f337660690f8df0f90c4e37496aa
 EBUILD udev-119.ebuild 10169 RMD160 e9e0b3b4d9487fb77495ff08e12a70cea5762a85 SHA1 709baaadef461a85ed4a876e04a4e3c11a72b994 SHA256 5c14efe9fcea0afa44aab6fb2579f69e02d083914170265cd2942df9b9d18842
-EBUILD udev-124-r1.ebuild 10678 RMD160 2e1a77893a7da44e303a8d5106c2324328824301 SHA1 bbc1fb9fb908b356777aa9ae433bb11d2e20516b SHA256 0774d68ffefa1b19fd82f3d9f1694ab81aec4532964e99d25a77e73d8076386e
-EBUILD udev-124-r2.ebuild 11032 RMD160 ab5d492c150c8627628f16bbcae00b97f0a03523 SHA1 03c059b69c16695bd40f4cb7db53b7c18448465d SHA256 3fc41904dbafe66b4669e3ebdb327c5f50f43b148e29cccb786f0be10d8702aa
+EBUILD udev-124-r1.ebuild 10678 RMD160 6b6267b7bbc071d5f36f7197badc7d8ac646e671 SHA1 b82cc03f2c5be5df6776fc19cddd821523792c08 SHA256 6279c6921d8b6b45855c0284acc0309a92d7613732cf080a4879dcfaaf119e7c
+EBUILD udev-124-r2.ebuild 11035 RMD160 6d17242ff354b614312f6033d19e82a982cf1d7f SHA1 8157db46b65cf6e8de606f1345e4873974efeec9 SHA256 eeee3f1060b90828326f5ed63226769fc6e20aa91299e15d7983a9d2c54a1a57
 EBUILD udev-141-r1.ebuild 13023 RMD160 ac7e1148dd14ee5315e7d3d2da45cd3a31b52abb SHA1 5803d0b73f84d2c0e24a3580cc8459c4d24656fe SHA256 0d6868c0ac752a3d86d4d0598dda40d20c17282c8ef098e292d41e0b4ab6aefd
 EBUILD udev-141.ebuild 12476 RMD160 0e0458c0405e11ebc647b9666f05302bfe5b3071 SHA1 b47ae1386992f51a9c29c453cc3f91a244705f00 SHA256 558af77dea41b6203364773a659136055b20cc1cd713c916341860fa57f704bb
 EBUILD udev-145.ebuild 13404 RMD160 19bfdddc5f862f932e802ad0cb753e5397224f37 SHA1 d377cef1db650eca2daefbbd05b21e766c99fa66 SHA256 6deed511e7f06545957a35da4fe3e64b538ae01c7bdda0c78b0a61a3ad850670
 EBUILD udev-9999.ebuild 13330 RMD160 c1965afa19708e151fda998138b7fb57d3e0d8c1 SHA1 70c2d2eb7e72105a6ca3f9a29f7eb26016e7bdaf SHA256 7f7bb4e126878499a1ce5fc20902e99264d2622783c25a933589f278808b52f6
-MISC ChangeLog 98236 RMD160 8828036cfe574fb4b42b0f522990a124ee291905 SHA1 5e180290b917ca3b6679ab595088e614be91fc86 SHA256 d37e01948c1c13eecb122859a5ab20610984047062b5c1307deb98e61f2c9f63
+MISC ChangeLog 98398 RMD160 b69d93121d30840258c2189573d94211a33ac282 SHA1 a1208b14b8b4e5fe5e28fb617844fd4a688915df SHA256 12f1a51c41fee244958cba186e5c4b8de48b6e231f6bf2683c6da5621020ca20
 MISC metadata.xml 402 RMD160 fad8844286866f47eadb2fd958f54f650976fe2a SHA1 c966d4e9e509d399523d1ba6ef54277e750334de SHA256 1c524286463bf115615462e9504c27710331f1d82a0828de5d78686f5e303ed5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpe2WoACgkQt2vP6XvVdOc3XwCgxF7Tp+1U4ItUw3xaHyk0/HJY
-kZQAoIlXyPSTs5AJ6yzVopo2GNewXtTc
-=z6Rb
+iEYEARECAAYFAkpe6OYACgkQt2vP6XvVdOeNTACg4NCvXsFd8OOD+k9deX4JEPhA
+ciEAoICrmwg1WWBmw84FzXRdoM8M/Kw/
+=Dckk
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-124-r1.ebuild b/sys-fs/udev/udev-124-r1.ebuild
index 152f233a8530..acde1fa317d6 100644
--- a/sys-fs/udev/udev-124-r1.ebuild
+++ b/sys-fs/udev/udev-124-r1.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-r1.ebuild,v 1.11 2009/05/06 23:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r1.ebuild,v 1.12 2009/07/16 08:46:22 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -353,8 +353,9 @@ pkg_postinst() {
 				killall -15 udevd &>/dev/null
 				sleep 1
 				killall -9 udevd &>/dev/null
+
+				/sbin/udevd --daemon
 			fi
-			/sbin/udevd --daemon
 		fi
 	fi
 
diff --git a/sys-fs/udev/udev-124-r2.ebuild b/sys-fs/udev/udev-124-r2.ebuild
index bd61485ea4a6..c506dcaa7ed3 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.9 2009/05/12 17:46:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-124-r2.ebuild,v 1.10 2009/07/16 08:46:22 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -366,8 +366,9 @@ pkg_postinst() {
 				killall -15 udevd &>/dev/null
 				sleep 1
 				killall -9 udevd &>/dev/null
+
+				/sbin/udevd --daemon
 			fi
-			/sbin/udevd --daemon
 		fi
 	fi