Changed udev-start.sh to return an exit-code of 0, to not let baselayout think udev failed, and start mdev afterwards, solving bug #179847.

Package-Manager: portage-2.1.2.7

5 files changed, 32 insertions, 21 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 58b48cb2458b..7b33a4461484 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # 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.309 2007/05/25 13:51:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.310 2007/05/27 08:15:44 zzam Exp $
+
+*udev-111-r3 (27 May 2007)
+
+  27 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  -files/udev-start-111-r2.sh, +files/udev-start-111-r3.sh,
+  -udev-111-r2.ebuild, +udev-111-r3.ebuild:
+  Changed udev-start.sh to return an exit-code of 0, to not let baselayout
+  think udev failed, and start mdev afterwards, solving bug #179847.
 
 *udev-111-r2 (25 May 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 18d1d0b30aa9..6e0a2aeab204 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -85,10 +85,10 @@ AUX udev-start-110-r1.sh 5327 RMD160 caeac2277a26017330b9c626976842eadfb0b11f SH
 MD5 07f7b394707e9c1a70e7511a4fd5f810 files/udev-start-110-r1.sh 5327
 RMD160 caeac2277a26017330b9c626976842eadfb0b11f files/udev-start-110-r1.sh 5327
 SHA256 7845199f72bc41f440da36a8a3e44c92b943fdbb84241f13c073961246190ad7 files/udev-start-110-r1.sh 5327
-AUX udev-start-111-r2.sh 5452 RMD160 9b9e36af971f8933b8edd329d991050944bb5906 SHA1 739578c45a075bf16f83ce7df8909db9c2b6c682 SHA256 402824c23d1af890722abf3651c4f2ad08b4acf683472e01ce8ff985eb8c7fb1
-MD5 b38cb9fe1d6e219fe954bc4d01055e89 files/udev-start-111-r2.sh 5452
-RMD160 9b9e36af971f8933b8edd329d991050944bb5906 files/udev-start-111-r2.sh 5452
-SHA256 402824c23d1af890722abf3651c4f2ad08b4acf683472e01ce8ff985eb8c7fb1 files/udev-start-111-r2.sh 5452
+AUX udev-start-111-r3.sh 5492 RMD160 d2a50553900f27c84a2bb6375f6caa95d3cb2d56 SHA1 1c1c2c818bd56a175968237458223d49414c2cb6 SHA256 b60e39b3c6a95340ee5faf46f4a181aa50c203bad22c8e0159a9ccd9b2894370
+MD5 d5f8a0847b2cf4919057109bd747945d files/udev-start-111-r3.sh 5492
+RMD160 d2a50553900f27c84a2bb6375f6caa95d3cb2d56 files/udev-start-111-r3.sh 5492
+SHA256 b60e39b3c6a95340ee5faf46f4a181aa50c203bad22c8e0159a9ccd9b2894370 files/udev-start-111-r3.sh 5492
 AUX udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e SHA1 78ec2b84513e9acba286dd5abb95e21f6d54d999 SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c
 MD5 cbc06136105b520864575794e0dc3de7 files/udev-stop-104-r8.sh 3208
 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e files/udev-stop-104-r8.sh 3208
@@ -123,18 +123,18 @@ EBUILD udev-111-r1.ebuild 10289 RMD160 977633c568082766d6b44c616ce622da68f90166
 MD5 75f7f771d5e710ceaa69a1b501496ac6 udev-111-r1.ebuild 10289
 RMD160 977633c568082766d6b44c616ce622da68f90166 udev-111-r1.ebuild 10289
 SHA256 498b5721ec3206f3c9c41fc0db5abbb9836341c81139489c3429e0bf2aa832d5 udev-111-r1.ebuild 10289
-EBUILD udev-111-r2.ebuild 10286 RMD160 87de871c52faebc0528bd265618fed611508861f SHA1 bda8c5c653e72747e966fc108436131fb96bcbf7 SHA256 e846ccf0af928985e6d1d671d15167ffaaaaa2061579bfd7fee15a8cf0e13fd5
-MD5 6ea077de172bae3d519cf70d7e7d82bc udev-111-r2.ebuild 10286
-RMD160 87de871c52faebc0528bd265618fed611508861f udev-111-r2.ebuild 10286
-SHA256 e846ccf0af928985e6d1d671d15167ffaaaaa2061579bfd7fee15a8cf0e13fd5 udev-111-r2.ebuild 10286
+EBUILD udev-111-r3.ebuild 10286 RMD160 5bbed52b3668e2a81da9cc9aa7ce207e9d906d1b SHA1 497266d663a9ff8fbba3a51397d7fc5f541990b4 SHA256 4fd1c70e2c7776d57203260a195befddb6d3a48fe496ea26df0b7610d28d4824
+MD5 494517b1a5369db880db4ffb6e4e0a21 udev-111-r3.ebuild 10286
+RMD160 5bbed52b3668e2a81da9cc9aa7ce207e9d906d1b udev-111-r3.ebuild 10286
+SHA256 4fd1c70e2c7776d57203260a195befddb6d3a48fe496ea26df0b7610d28d4824 udev-111-r3.ebuild 10286
 EBUILD udev-111.ebuild 10283 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb SHA1 83100c8bc471cf1cf6d4bc439f9ad069ef279c8c SHA256 bee390b8c0e10bbc659aca22ef4b073712a6491b8a377797b4639965fb410650
 MD5 1304b26ff1a45be54fb571bbac6f3706 udev-111.ebuild 10283
 RMD160 d43cbdbd20902f110485e4299a8767a223f3c7fb udev-111.ebuild 10283
 SHA256 bee390b8c0e10bbc659aca22ef4b073712a6491b8a377797b4639965fb410650 udev-111.ebuild 10283
-MISC ChangeLog 61942 RMD160 929e610c83a54172c9ac9f48849e635d48aed917 SHA1 785cd57d8597f6f9332354089e12d1daa7f4447a SHA256 0c689d5624def14af539bf63ba2614477ef144bce71dbea103a8e464e25435dc
-MD5 9e8c138bebb90e704abc0519cebdca27 ChangeLog 61942
-RMD160 929e610c83a54172c9ac9f48849e635d48aed917 ChangeLog 61942
-SHA256 0c689d5624def14af539bf63ba2614477ef144bce71dbea103a8e464e25435dc ChangeLog 61942
+MISC ChangeLog 62272 RMD160 30db2a210f037ab6e8eeab68cacfac7790f63ef8 SHA1 a6fd993af21e739b67e653182651147e5464601a SHA256 757cf0ec2c054cf6217fbd0ea5167035c369fb147b6f0e7fd9dd5be0fd834893
+MD5 97634f6fb93884527c5683ad0e5ed9aa ChangeLog 62272
+RMD160 30db2a210f037ab6e8eeab68cacfac7790f63ef8 ChangeLog 62272
+SHA256 757cf0ec2c054cf6217fbd0ea5167035c369fb147b6f0e7fd9dd5be0fd834893 ChangeLog 62272
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -148,13 +148,13 @@ SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/di
 MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111-r1 229
 RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111-r1 229
 SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111-r1 229
-MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111-r2 229
-RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111-r2 229
-SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111-r2 229
+MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111-r3 229
+RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111-r3 229
+SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111-r3 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVunUt2vP6XvVdOcRAiSYAJ4nsDPMYUz1P19CD/SAGpU7dD6m2ACgy6Tk
-8PMEqXKhoKO7QG6yGrlSdJA=
-=PTNY
+iD8DBQFGWT43t2vP6XvVdOcRAtOCAKCMK9VBkahMZo79BHSd36SdKWT28wCeJYpX
+wMFpfG8FaWzu8pN/gVFF93A=
+=GNRV
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-111-r2 b/sys-fs/udev/files/digest-udev-111-r3
index 6cefddeda901..6cefddeda901 100644
--- a/sys-fs/udev/files/digest-udev-111-r2
+++ b/sys-fs/udev/files/digest-udev-111-r3
diff --git a/sys-fs/udev/files/udev-start-111-r2.sh b/sys-fs/udev/files/udev-start-111-r3.sh
index fbc867a21e4c..53ff8db091ce 100644
--- a/sys-fs/udev/files/udev-start-111-r2.sh
+++ b/sys-fs/udev/files/udev-start-111-r3.sh
@@ -199,6 +199,9 @@ main() {
 
 	# trigger executing initscript when /etc is writable
 	IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null
+
+	# udev started successfully
+	return 0
 }
 
 main
diff --git a/sys-fs/udev/udev-111-r2.ebuild b/sys-fs/udev/udev-111-r3.ebuild
index 2b1a5e01ec79..3642ecb52a85 100644
--- a/sys-fs/udev/udev-111-r2.ebuild
+++ b/sys-fs/udev/udev-111-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-111-r2.ebuild,v 1.1 2007/05/25 13:51:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-111-r3.ebuild,v 1.1 2007/05/27 08:15:44 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -172,7 +172,7 @@ src_install() {
 
 	# our udev hooks into the rc system
 	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/udev-start-111-r2.sh udev-start.sh
+	newins "${FILESDIR}"/udev-start-111-r3.sh udev-start.sh
 	newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh
 
 	# The udev-post init-script