1 |
commit: 421b210c67a59b5a92ce5a92c6d49254cf1ec07a |
2 |
Author: Fabio Erculiani <lxnay <AT> sabayon <DOT> org> |
3 |
AuthorDate: Tue Apr 23 15:26:24 2013 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 25 07:20:27 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=421b210c |
7 |
|
8 |
Drop KV_2_6_OR_GREATER |
9 |
|
10 |
Linux 2.2 and 2.4 are no longer supported. RIP old kernels. |
11 |
|
12 |
--- |
13 |
defaults/initrd.defaults | 5 ----- |
14 |
defaults/linuxrc | 18 ++++++------------ |
15 |
2 files changed, 6 insertions(+), 17 deletions(-) |
16 |
|
17 |
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults |
18 |
index 8ff5510..e70beab 100755 |
19 |
--- a/defaults/initrd.defaults |
20 |
+++ b/defaults/initrd.defaults |
21 |
@@ -50,11 +50,6 @@ KMINOR=`echo $KV | cut -f2 -d.` |
22 |
KVER="${KMAJOR}.${KMINOR}" |
23 |
MISCOPTS='debug detect' |
24 |
|
25 |
-if [ "${KMAJOR}" -ge 3 ] || [ "${KMAJOR}" -eq 2 -a "${KMINOR}" -eq '6' ] |
26 |
-then |
27 |
- KV_2_6_OR_GREATER="yes" |
28 |
-fi |
29 |
- |
30 |
QUIET='1' |
31 |
ROOT_LINKS='bin sbin lib lib32 lib64 boot usr opt emul' |
32 |
ROOT_TREES='etc root home var' |
33 |
|
34 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
35 |
index 703652d..0fe05ef 100755 |
36 |
--- a/defaults/linuxrc |
37 |
+++ b/defaults/linuxrc |
38 |
@@ -324,16 +324,13 @@ mount_devfs |
39 |
mount_sysfs |
40 |
|
41 |
# Initialize mdev |
42 |
-if [ "${KV_2_6_OR_GREATER}" ] |
43 |
-then |
44 |
- good_msg 'Activating mdev' |
45 |
+good_msg 'Activating mdev' |
46 |
|
47 |
- # Serialize hotplug events |
48 |
- touch /dev/mdev.seq |
49 |
+# Serialize hotplug events |
50 |
+touch /dev/mdev.seq |
51 |
|
52 |
- # Setup hotplugging for firmware loading |
53 |
- echo /sbin/mdev > /proc/sys/kernel/hotplug |
54 |
-fi |
55 |
+# Setup hotplugging for firmware loading |
56 |
+echo /sbin/mdev > /proc/sys/kernel/hotplug |
57 |
|
58 |
# Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel |
59 |
if [ -z "${DO_modules}" ] |
60 |
@@ -357,10 +354,7 @@ else |
61 |
fi |
62 |
|
63 |
# Ensure that device nodes are properly configured |
64 |
-if [ "${KV_2_6_OR_GREATER}" ] |
65 |
-then |
66 |
- mdev -s || bad_msg "mdev -s failed" |
67 |
-fi |
68 |
+mdev -s || bad_msg "mdev -s failed" |
69 |
|
70 |
# Apply scan delay if specified |
71 |
sdelay |