[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/, conf.d/, /

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/, conf.d/, /

[William Hubbs]

commit:     13f562eaf18c47a9547e15fa475a74187bb71c81
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 15:29:06 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 15:31:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=13f562ea

remove warning about unreliable kernel/udev combination

Udev upstream requires a certain version of the kernel to be run with
udev. We had a test for a reliable kernel version to use with udev, but
that version was lower than upstream's requirement. I do not see a
reason to allow a version of the kernel lower than upstream's
requirements to be run with udev.

---
 Makefile    |    2 --
 conf.d/udev |    3 ---
 init.d/udev |    7 -------
 3 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index fc23e82..055d71a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ MODPROBE_DIR ?= $(SYSCONFDIR)/modprobe.d
 VERSION = $(shell git describe --tags)
 
 KV_min ?= 2.6.24
-KV_reliable ?= 2.6.26
 
 DESTNAME = udev-gentoo-scripts-$(VERSION)
 
@@ -35,7 +34,6 @@ install:
 	@install -d $(DESTDIR)$(MODPROBE_DIR)
 	@install -m 0644 modprobe.d/* $(DESTDIR)$(MODPROBE_DIR)
 	@sed -e "s/%KV_MIN%/$(KV_min)/" \
-		-e "s/%KV_MIN_RELIABLE%/$(KV_reliable)/" \
 		-i "$(DESTDIR)$(INITD)"/udev
 
 check-git-repository:

diff --git a/conf.d/udev b/conf.d/udev
index da113a8..12c2afa 100644
--- a/conf.d/udev
+++ b/conf.d/udev
@@ -27,9 +27,6 @@ persistent_cd_disable="no"
 
 # Expert options:
 
-# Disable warning about unreliable kernel/udev combination
-#unreliable_kernel_warning="no"
-
 # Timeout in seconds to wait for processing of uevents at boot.
 # There should be no need to change this.
 #udev_settle_timeout="60"

diff --git a/init.d/udev b/init.d/udev
index cb1ad02..51e7081 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -15,7 +15,6 @@ udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
-unreliable_kernel_warning="${unreliable_kernel_warning:-yes}"
 
 depend()
 {
@@ -40,12 +39,6 @@ check_kernel()
 		eerror "Current udev only supports Linux kernel %KV_MIN% and newer."
 		return 1
 	fi
-
-	yesno "${unreliable_kernel_warning}" || return 0
-
-	if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then
-		ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev."
-	fi
 	return 0
 }