1 |
commit: 13f562eaf18c47a9547e15fa475a74187bb71c81 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 29 15:29:06 2011 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 29 15:31:36 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=13f562ea |
7 |
|
8 |
remove warning about unreliable kernel/udev combination |
9 |
|
10 |
Udev upstream requires a certain version of the kernel to be run with |
11 |
udev. We had a test for a reliable kernel version to use with udev, but |
12 |
that version was lower than upstream's requirement. I do not see a |
13 |
reason to allow a version of the kernel lower than upstream's |
14 |
requirements to be run with udev. |
15 |
|
16 |
--- |
17 |
Makefile | 2 -- |
18 |
conf.d/udev | 3 --- |
19 |
init.d/udev | 7 ------- |
20 |
3 files changed, 0 insertions(+), 12 deletions(-) |
21 |
|
22 |
diff --git a/Makefile b/Makefile |
23 |
index fc23e82..055d71a 100644 |
24 |
--- a/Makefile |
25 |
+++ b/Makefile |
26 |
@@ -8,7 +8,6 @@ MODPROBE_DIR ?= $(SYSCONFDIR)/modprobe.d |
27 |
VERSION = $(shell git describe --tags) |
28 |
|
29 |
KV_min ?= 2.6.24 |
30 |
-KV_reliable ?= 2.6.26 |
31 |
|
32 |
DESTNAME = udev-gentoo-scripts-$(VERSION) |
33 |
|
34 |
@@ -35,7 +34,6 @@ install: |
35 |
@install -d $(DESTDIR)$(MODPROBE_DIR) |
36 |
@install -m 0644 modprobe.d/* $(DESTDIR)$(MODPROBE_DIR) |
37 |
@sed -e "s/%KV_MIN%/$(KV_min)/" \ |
38 |
- -e "s/%KV_MIN_RELIABLE%/$(KV_reliable)/" \ |
39 |
-i "$(DESTDIR)$(INITD)"/udev |
40 |
|
41 |
check-git-repository: |
42 |
|
43 |
diff --git a/conf.d/udev b/conf.d/udev |
44 |
index da113a8..12c2afa 100644 |
45 |
--- a/conf.d/udev |
46 |
+++ b/conf.d/udev |
47 |
@@ -27,9 +27,6 @@ persistent_cd_disable="no" |
48 |
|
49 |
# Expert options: |
50 |
|
51 |
-# Disable warning about unreliable kernel/udev combination |
52 |
-#unreliable_kernel_warning="no" |
53 |
- |
54 |
# Timeout in seconds to wait for processing of uevents at boot. |
55 |
# There should be no need to change this. |
56 |
#udev_settle_timeout="60" |
57 |
|
58 |
diff --git a/init.d/udev b/init.d/udev |
59 |
index cb1ad02..51e7081 100644 |
60 |
--- a/init.d/udev |
61 |
+++ b/init.d/udev |
62 |
@@ -15,7 +15,6 @@ udev_debug="${udev_debug:-no}" |
63 |
udev_monitor="${udev_monitor:-no}" |
64 |
udev_monitor_keep_running="${udev_monitor_keep_running:-no}" |
65 |
udev_settle_timeout="${udev_settle_timeout:-60}" |
66 |
-unreliable_kernel_warning="${unreliable_kernel_warning:-yes}" |
67 |
|
68 |
depend() |
69 |
{ |
70 |
@@ -40,12 +39,6 @@ check_kernel() |
71 |
eerror "Current udev only supports Linux kernel %KV_MIN% and newer." |
72 |
return 1 |
73 |
fi |
74 |
- |
75 |
- yesno "${unreliable_kernel_warning}" || return 0 |
76 |
- |
77 |
- if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then |
78 |
- ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." |
79 |
- fi |
80 |
return 0 |
81 |
} |