1 |
zzam 07/09/11 21:50:21 |
2 |
|
3 |
Modified: udev-115-add-special-rule-files.diff pnp-aliases |
4 |
Added: udev.conf.post_115 udev-start-115-r3.sh |
5 |
udev-115-fix-modprobe-calls.diff digest-udev-115-r3 |
6 |
Log: |
7 |
No longer use modprobe-wrapper, that should fix bug 191813 and other breakages caused by our wrapper. This also removes auto-blacklisting of modules that get loaded by modules.autoload. It will break blacklisting of some special aliased modules like pcspkr until bug 192201 is fixed. Now also run persistent-net rules when coldplug is disabled, bug 191466. |
8 |
(Portage version: 2.1.3.9) |
9 |
|
10 |
Revision Changes Path |
11 |
1.6 sys-fs/udev/files/udev-115-add-special-rule-files.diff |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-add-special-rule-files.diff?rev=1.6&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-add-special-rule-files.diff?rev=1.6&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-add-special-rule-files.diff?r1=1.5&r2=1.6 |
16 |
|
17 |
Index: udev-115-add-special-rule-files.diff |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-115-add-special-rule-files.diff,v |
20 |
retrieving revision 1.5 |
21 |
retrieving revision 1.6 |
22 |
diff -u -r1.5 -r1.6 |
23 |
--- udev-115-add-special-rule-files.diff 10 Sep 2007 18:34:10 -0000 1.5 |
24 |
+++ udev-115-add-special-rule-files.diff 11 Sep 2007 21:50:21 -0000 1.6 |
25 |
@@ -52,7 +52,7 @@ |
26 |
=================================================================== |
27 |
--- /dev/null |
28 |
+++ udev-git/etc/udev/gentoo/40-video.rules |
29 |
-@@ -0,0 +1,25 @@ |
30 |
+@@ -0,0 +1,24 @@ |
31 |
+# do not edit this file, it will be overwritten on update |
32 |
+ |
33 |
+# video4linux |
34 |
@@ -66,8 +66,7 @@ |
35 |
+# device node will be /dev/dri/card? |
36 |
+KERNEL=="card*", GROUP="video" |
37 |
+KERNEL=="nvidia*", GROUP="video" |
38 |
-+# drac thinks we do not need this. Please bug us if it is needed. |
39 |
-+#KERNEL=="3dfx*", GROUP="video" |
40 |
++KERNEL=="3dfx*", GROUP="video" |
41 |
+ |
42 |
+# Framebuffer |
43 |
+# do we need /dev/fb/0 really? |
44 |
|
45 |
|
46 |
|
47 |
1.2 sys-fs/udev/files/pnp-aliases |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/pnp-aliases?rev=1.2&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/pnp-aliases?rev=1.2&content-type=text/plain |
51 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/pnp-aliases?r1=1.1&r2=1.2 |
52 |
|
53 |
Index: pnp-aliases |
54 |
=================================================================== |
55 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/files/pnp-aliases,v |
56 |
retrieving revision 1.1 |
57 |
retrieving revision 1.2 |
58 |
diff -u -r1.1 -r1.2 |
59 |
--- pnp-aliases 13 Mar 2007 18:59:45 -0000 1.1 |
60 |
+++ pnp-aliases 11 Sep 2007 21:50:21 -0000 1.2 |
61 |
@@ -1,7 +1,7 @@ |
62 |
# /etc/modprobe.d/pnp-aliases |
63 |
# |
64 |
# These aliases are used by this udev-rule: |
65 |
-# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'" |
66 |
+# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" |
67 |
# |
68 |
# They should help to autoload drivers used by various pnp-devices |
69 |
# (if not blacklisted somewhere else) |
70 |
|
71 |
|
72 |
|
73 |
1.1 sys-fs/udev/files/udev.conf.post_115 |
74 |
|
75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev.conf.post_115?rev=1.1&view=markup |
76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev.conf.post_115?rev=1.1&content-type=text/plain |
77 |
|
78 |
Index: udev.conf.post_115 |
79 |
=================================================================== |
80 |
# The maximum size reserved for the tmpfs mounted on /dev |
81 |
tmpfs_size="10M" |
82 |
|
83 |
|
84 |
|
85 |
|
86 |
1.1 sys-fs/udev/files/udev-start-115-r3.sh |
87 |
|
88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-115-r3.sh?rev=1.1&view=markup |
89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-115-r3.sh?rev=1.1&content-type=text/plain |
90 |
|
91 |
Index: udev-start-115-r3.sh |
92 |
=================================================================== |
93 |
# Copyright 1999-2007 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
|
96 |
tmpfs_size="10M" |
97 |
|
98 |
[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf |
99 |
|
100 |
mount_dev_directory() { |
101 |
# Setup temporary storage for /dev |
102 |
ebegin "Mounting /dev for udev" |
103 |
if [ "${RC_USE_FSTAB}" = "yes" ] ; then |
104 |
mntcmd=$(get_mount_fstab /dev) |
105 |
else |
106 |
unset mntcmd |
107 |
fi |
108 |
if [ -n "${mntcmd}" ] ; then |
109 |
try mount -n ${mntcmd} |
110 |
else |
111 |
mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" |
112 |
if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then |
113 |
mntcmd="tmpfs" |
114 |
else |
115 |
mntcmd="ramfs" |
116 |
fi |
117 |
# many video drivers require exec access in /dev #92921 |
118 |
try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev |
119 |
fi |
120 |
eend $? |
121 |
} |
122 |
|
123 |
populate_udev() { |
124 |
# populate /dev with devices already found by the kernel |
125 |
|
126 |
if get_bootparam "nocoldplug" ; then |
127 |
RC_COLDPLUG="no" |
128 |
ewarn "Skipping udev coldplug as requested in kernel cmdline" |
129 |
fi |
130 |
|
131 |
# at this point we are already sure to use kernel 2.6.15 or newer |
132 |
ebegin "Populating /dev with existing devices through uevents" |
133 |
if [ "${RC_COLDPLUG}" = "yes" ]; then |
134 |
/sbin/udevtrigger |
135 |
else |
136 |
# only create device nodes |
137 |
/sbin/udevtrigger --attr-match=dev |
138 |
# run persistent-net stuff, bug 191466 |
139 |
/sbin/udevtrigger --subsystem-match=net |
140 |
fi |
141 |
eend $? |
142 |
|
143 |
# loop until everything is finished |
144 |
# there's gotta be a better way... |
145 |
ebegin "Letting udev process events" |
146 |
/sbin/udevsettle --timeout=60 |
147 |
eend $? |
148 |
|
149 |
rm -f /dev/.udev_populate |
150 |
return 0 |
151 |
} |
152 |
|
153 |
seed_dev() { |
154 |
# Seed /dev with some things that we know we need |
155 |
ebegin "Seeding /dev with needed nodes" |
156 |
|
157 |
# creating /dev/console and /dev/tty1 to be able to write |
158 |
# to $CONSOLE with/without bootsplash before udevd creates it |
159 |
[ ! -c /dev/console ] && mknod /dev/console c 5 1 |
160 |
[ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 |
161 |
|
162 |
# udevd will dup its stdin/stdout/stderr to /dev/null |
163 |
# and we do not want a file which gets buffered in ram |
164 |
[ ! -c /dev/null ] && mknod /dev/null c 1 3 |
165 |
|
166 |
# copy over any persistant things |
167 |
if [ -d /lib/udev/devices ] ; then |
168 |
cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null |
169 |
fi |
170 |
|
171 |
# Not provided by sysfs but needed |
172 |
ln -snf /proc/self/fd /dev/fd |
173 |
ln -snf fd/0 /dev/stdin |
174 |
ln -snf fd/1 /dev/stdout |
175 |
ln -snf fd/2 /dev/stderr |
176 |
[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core |
177 |
|
178 |
# Create problematic directories |
179 |
mkdir -p /dev/pts /dev/shm |
180 |
eend 0 |
181 |
} |
182 |
|
183 |
unpack_device_tarball() { |
184 |
# Actually get udev rolling |
185 |
if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ |
186 |
[ -s /lib/udev/state/devices.tar.bz2 ] ; then |
187 |
ebegin "Populating /dev with saved device nodes" |
188 |
try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev |
189 |
eend $? |
190 |
fi |
191 |
} |
192 |
|
193 |
check_persistent_net() { |
194 |
# check if there are problems with persistent-net |
195 |
local syspath= |
196 |
local devs= |
197 |
local problem_found=0 |
198 |
for syspath in /sys/class/net/*_rename*; do |
199 |
if [ -d "${syspath}" ]; then |
200 |
devs="${devs} ${syspath##*/}" |
201 |
problem_found=1 |
202 |
fi |
203 |
done |
204 |
|
205 |
[ "${problem_found}" = 0 ] && return 0 |
206 |
|
207 |
eerror "UDEV: Your system has a problem assigning persistent names" |
208 |
eerror "to these network interfaces: ${devs}" |
209 |
|
210 |
einfo "Checking persistent-net rules:" |
211 |
# the sed-expression lists all duplicate lines |
212 |
# from the input, like "uniq -d" does, but uniq |
213 |
# is installed into /usr/bin and not available at boot. |
214 |
dups=$( |
215 |
RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' |
216 |
. /lib/udev/rule_generator.functions |
217 |
find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' |
218 |
) |
219 |
if [ -n "${dups}" ]; then |
220 |
ewarn "The rules create multiple entries assigning these names:" |
221 |
eindent |
222 |
ewarn "${dups}" |
223 |
eoutdent |
224 |
else |
225 |
ewarn "Found no duplicate names in persistent-net rules," |
226 |
ewarn "there must be some other problem!" |
227 |
fi |
228 |
return 1 |
229 |
} |
230 |
|
231 |
main() { |
232 |
if [ $(get_KV) -le $(KV_to_int '2.6.14') ] ; then |
233 |
eerror "Your kernel is too old to work with this version of udev." |
234 |
eerror "Current udev only supports Linux kernel 2.6.15 and newer." |
235 |
return 1 |
236 |
fi |
237 |
|
238 |
mount_dev_directory |
239 |
|
240 |
# Create a file so that our rc system knows it's still in sysinit. |
241 |
# Existance means init scripts will not directly run. |
242 |
# rc will remove the file when done with sysinit. |
243 |
touch /dev/.rcsysinit |
244 |
|
245 |
# Selinux lovin; /selinux should be mounted by selinux-patched init |
246 |
if [ -x /sbin/restorecon -a -c /selinux/null ] ; then |
247 |
restorecon /dev > /selinux/null |
248 |
fi |
249 |
|
250 |
unpack_device_tarball |
251 |
seed_dev |
252 |
|
253 |
if [ -e /proc/sys/kernel/hotplug ] ; then |
254 |
echo "" > /proc/sys/kernel/hotplug |
255 |
fi |
256 |
|
257 |
ebegin "Starting udevd" |
258 |
/sbin/udevd --daemon |
259 |
eend $? |
260 |
|
261 |
/lib/udev/write_root_link_rule |
262 |
populate_udev |
263 |
|
264 |
# Only do this for baselayout-1* |
265 |
if [ ! -e /lib/librc.so ]; then |
266 |
|
267 |
# Create nodes that udev can't |
268 |
ebegin "Finalizing udev configuration" |
269 |
[ -x /sbin/lvm ] && \ |
270 |
/sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null |
271 |
# Running evms_activate on a LiveCD causes lots of headaches |
272 |
[ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ |
273 |
/sbin/evms_activate -q &>/dev/null |
274 |
eend 0 |
275 |
fi |
276 |
|
277 |
check_persistent_net |
278 |
|
279 |
# trigger executing initscript when /etc is writable |
280 |
IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null |
281 |
|
282 |
# udev started successfully |
283 |
return 0 |
284 |
} |
285 |
|
286 |
main |
287 |
|
288 |
# vim:ts=4 |
289 |
|
290 |
|
291 |
|
292 |
1.1 sys-fs/udev/files/udev-115-fix-modprobe-calls.diff |
293 |
|
294 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff?rev=1.1&view=markup |
295 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff?rev=1.1&content-type=text/plain |
296 |
|
297 |
Index: udev-115-fix-modprobe-calls.diff |
298 |
=================================================================== |
299 |
Index: udev-git/etc/udev/gentoo/30-kernel-compat.rules |
300 |
=================================================================== |
301 |
--- udev-git.orig/etc/udev/gentoo/30-kernel-compat.rules |
302 |
+++ udev-git/etc/udev/gentoo/30-kernel-compat.rules |
303 |
@@ -34,13 +34,13 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_c |
304 |
# sr: 4 TYPE_WORM, 5 TYPE_ROM |
305 |
# st/osst: 1 TYPE_TAPE |
306 |
|
307 |
- ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod" |
308 |
- ATTRS{type}=="4|5", RUN+="modprobe.sh sr_mod" |
309 |
- ATTRS{type}=="8", RUN+="modprobe.sh ch" |
310 |
+ ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" |
311 |
+ ATTRS{type}=="4|5", RUN+="/sbin/modprobe sr_mod" |
312 |
+ ATTRS{type}=="8", RUN+="/sbin/modprobe ch" |
313 |
|
314 |
ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ |
315 |
- ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end" |
316 |
- ATTRS{type}=="1", RUN+="modprobe.sh st" |
317 |
+ ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end" |
318 |
+ ATTRS{type}=="1", RUN+="/sbin/modprobe st" |
319 |
|
320 |
LABEL="kernel_compat_end" |
321 |
|
322 |
|
323 |
|
324 |
|
325 |
1.1 sys-fs/udev/files/digest-udev-115-r3 |
326 |
|
327 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/digest-udev-115-r3?rev=1.1&view=markup |
328 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/digest-udev-115-r3?rev=1.1&content-type=text/plain |
329 |
|
330 |
Index: digest-udev-115-r3 |
331 |
=================================================================== |
332 |
MD5 e3143b9e4f49a2d99633db5d39253c27 udev-115-update-20070910.diff.bz2 16364 |
333 |
RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 udev-115-update-20070910.diff.bz2 16364 |
334 |
SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763 udev-115-update-20070910.diff.bz2 16364 |
335 |
MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893 |
336 |
RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893 |
337 |
SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893 |
338 |
|
339 |
|
340 |
|
341 |
-- |
342 |
gentoo-commits@g.o mailing list |