Add ewarn about missing /dev/zero and about kernel older than 2.6.18. Cosmetics.

Package-Manager: portage-2.1.4.4

3 files changed, 31 insertions, 16 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 314bbb34d111..30afee0936f2 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.373 2008/04/03 13:48:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.374 2008/04/03 20:09:38 zzam Exp $
+
+  03 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  files/udev-start-119-r1.sh:
+  Add ewarn about missing /dev/zero and about kernel older than 2.6.18.
+  Cosmetics.
 
 *udev-119-r1 (03 Apr 2008)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c4ac4554e917..0dc78d2a9994 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -48,7 +48,7 @@ AUX udev-start-115-r3.sh 5160 RMD160 55843eff0e0e3d85fef44c82ec03ffde9d220617 SH
 AUX udev-start-115-r6.sh 5237 RMD160 47b9b267d99dae5c02ddea3145beb5ad39e990de SHA1 99ea6d9dc21d3bb05a6b01cd7473e44fe0a56ec1 SHA256 4aee73d21d34c0f20cab2800ea9b86ab6cb14efadaade23321b0d61f9b58fc17
 AUX udev-start-118-r1.sh 5353 RMD160 159826d39461d4c01256b0247c4c27a44abf16dd SHA1 8b5a0738df2adf4650840d1c62d2d79b55ae95ae SHA256 3145a511043ddf6909743ff01a4c5375025932367df8862d5e453561793526f6
 AUX udev-start-118-r2.sh 5072 RMD160 24b469dc45b70b6eac82ae3a32f1fb8b0d062c5f SHA1 259ffce13605ad5dd4495926862a1c30ed9c1b51 SHA256 90b6a7616767facf64bcc21563f7333f63633044c24fa56f6ca5647c5b8ee5dc
-AUX udev-start-119-r1.sh 5318 RMD160 2f56c0a1ac7555999a3685ca7fb4fcf1dda586fc SHA1 28afcc6d25d0084070e1854365d19b142c5716d4 SHA256 942839ca208fde6d79de60460a73651946065732ac6d5d47d6e79935c99223f3
+AUX udev-start-119-r1.sh 5587 RMD160 dc0436300de4b3ac6a3bf43bc9cfcb98af5626fc SHA1 a75b8c1429d81838376acf5754e6d3e01c715978 SHA256 c7b8d125cc31848f6ef292d6d3897340d47a2a834dafbbc9533633a32ebde564
 AUX udev-stop-104-r13.sh 3213 RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 SHA1 0ced2a331cf516019326d87e2b3c7978d2c02d23 SHA256 2762507dc5a640eb66823a87402d1ddae9c3430b47f69ff95a7e55f7c2f95be9
 AUX udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e SHA1 78ec2b84513e9acba286dd5abb95e21f6d54d999 SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c
 AUX udev-stop-110-r1.sh 2792 RMD160 2e91f2b3c71d1c9efd0fcf2b29330845abaa2948 SHA1 f76f618d9581530be3f62fedbf2f01be97f0c5ad SHA256 38df53470d073d14a28b2b56f2c1c3ec94d21bc9c75c0fec9549200f389e841f
@@ -101,12 +101,12 @@ EBUILD udev-118-r3.ebuild 9843 RMD160 40c512642638fabe7b157365040001e142075af5 S
 EBUILD udev-118.ebuild 9544 RMD160 72c7e3ea74d0e3681a7a76310f1f233454b247d1 SHA1 9689ed1182a612d4b31a3fbf344a3aa20a10353b SHA256 b51b5742df8e4c5e93ede735d3967cc922e25e0f3ddf4ef2df21b5b12f28c15e
 EBUILD udev-119-r1.ebuild 9866 RMD160 976da2e1e5ae267df2ebd106fcb7648bfb791e83 SHA1 2469a7825e30dff61f064e315c51005700e7505e SHA256 ba381263d3494072198e17c93473ec1b2edc4516abadc22b3c745284314f43ee
 EBUILD udev-119.ebuild 9863 RMD160 ccbc3432ac1efe0ec5dc522ff830a5b60405a2eb SHA1 ed38dd0c1272e5c0ae73c36313e5b68112d67659 SHA256 eb8ede8fa8fe38c1f887640d0492e4b488fd327958a09e7ce07da40d1e77a3f6
-MISC ChangeLog 75299 RMD160 f913d4d1a5e413e1e8ca9cefac3225c670c88473 SHA1 4e1ba9414ecd0d60d52b83934f0619343c002dc1 SHA256 635d62d2ce6329a6ac39beb3154ac0a1ecc1cd3eac0da1e63f0736ee9a456f0c
+MISC ChangeLog 75468 RMD160 d74c8cbbd0465867a6388fff8941612b88abb0fc SHA1 9eb53dc01353daac62b9c2b5d46b23b2ae034619 SHA256 cd14f50c1b4270f906f49461ba1c025637839ecd539bb2fd0880f72e21766bd6
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf04DEACgkQt2vP6XvVdOeMFQCg3vKQSlsyoaX4vAR4jXFFTqvt
-9+cAn1Eo3+Ohzgb+PR4o5Qe1B/nD12vL
-=QqO4
+iEYEARECAAYFAkf1OYgACgkQt2vP6XvVdOc8WgCdHgovLCJ8VrM9h9pKUtcbO6wU
+5KIAnjG3SPBwDHRKV+LXLVbkA0V+IsDu
+=cuHe
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-start-119-r1.sh b/sys-fs/udev/files/udev-start-119-r1.sh
index 760c008b5256..770159db0ba4 100644
--- a/sys-fs/udev/files/udev-start-119-r1.sh
+++ b/sys-fs/udev/files/udev-start-119-r1.sh
@@ -7,7 +7,8 @@
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
 rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}}
 
-cleanup() {
+cleanup()
+{
 	if [ "$1" != "0" ]; then
 		# cleanup to fail more gracely
 		start-stop-daemon --stop --exec /sbin/udevd
@@ -21,11 +22,14 @@ cleanup() {
 # Maybe something like udevd --test || exit $?
 check_kernel()
 {
-	if [ $(get_KV) -le $(KV_to_int '2.6.14') ]; then
+	if [ $(get_KV) -lt $(KV_to_int '2.6.15') ]; then
 		eerror "Your kernel is too old to work with this version of udev."
 		eerror "Current udev only supports Linux kernel 2.6.15 and newer."
 		return 1
 	fi
+	if [ $(get_KV) -lt $(KV_to_int '2.6.18') ]; then
+		ewarn "You need at least Linux kernel 2.6.18 for reliable operation of udev."
+	fi
 	return 0
 }
 
@@ -85,6 +89,13 @@ seed_dev()
 	return 0
 }
 
+disable_hotplug_agent()
+{
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+}
+
 start_udev()
 {
 	ebegin "Starting udevd"
@@ -123,7 +134,7 @@ populate_udev()
 	return 0
 }
 
-compat_device_nodes()
+compat_volume_nodes()
 {
 	# Only do this for baselayout-1*
 	if [ ! -e /lib/librc.so ]; then
@@ -192,24 +203,23 @@ fi
 
 unpack_device_tarball
 seed_dev
-
-if [ -e /proc/sys/kernel/hotplug ]; then
-	echo "" >/proc/sys/kernel/hotplug
-fi
-
+disable_hotplug_agent
 /lib/udev/write_root_link_rule
 
 start_udev || cleanup $?
 populate_udev || cleanup $?
 
-compat_device_nodes
+compat_volume_nodes
 check_persistent_net
 
 # trigger executing initscript when /etc is writable
 IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1
 
 # should exist on every system, else udev failed
-[ -e /dev/zero ] || cleanup 1
+if [ ! -e /dev/zero ]; then
+	eerror "Assuming udev failed somewhere, as /dev/zero does not exist."
+	cleanup 1
+fi
 
 # udev started successfully
 exit 0