diff options
Diffstat (limited to 'sys-fs/udev/files')
| -rw-r--r-- | sys-fs/udev/files/digest-udev-115-r3 | 6 | ||||
| -rw-r--r-- | sys-fs/udev/files/pnp-aliases | 2 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-115-add-special-rule-files.diff | 5 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-115-fix-modprobe-calls.diff | 23 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-start-115-r3.sh | 196 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev.conf.post_115 | 3 |
6 files changed, 231 insertions, 4 deletions
diff --git a/sys-fs/udev/files/digest-udev-115-r3 b/sys-fs/udev/files/digest-udev-115-r3 new file mode 100644 index 000000000000..6d969106793c --- /dev/null +++ b/sys-fs/udev/files/digest-udev-115-r3 @@ -0,0 +1,6 @@ +MD5 e3143b9e4f49a2d99633db5d39253c27 udev-115-update-20070910.diff.bz2 16364 +RMD160 c942f4d73406ae651c16b351cd11577a458f3af5 udev-115-update-20070910.diff.bz2 16364 +SHA256 432321885a798dcb51038007ff93ec14d1873ff230a99f7f62c408b3e826b763 udev-115-update-20070910.diff.bz2 16364 +MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893 +RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893 +SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893 diff --git a/sys-fs/udev/files/pnp-aliases b/sys-fs/udev/files/pnp-aliases index b6c44974a3ff..3675fbbc6999 100644 --- a/sys-fs/udev/files/pnp-aliases +++ b/sys-fs/udev/files/pnp-aliases @@ -1,7 +1,7 @@ # /etc/modprobe.d/pnp-aliases # # These aliases are used by this udev-rule: -# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'" +# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" # # They should help to autoload drivers used by various pnp-devices # (if not blacklisted somewhere else) diff --git a/sys-fs/udev/files/udev-115-add-special-rule-files.diff b/sys-fs/udev/files/udev-115-add-special-rule-files.diff index 0fef7f5fe4d9..815d2b76d577 100644 --- a/sys-fs/udev/files/udev-115-add-special-rule-files.diff +++ b/sys-fs/udev/files/udev-115-add-special-rule-files.diff @@ -52,7 +52,7 @@ Index: udev-git/etc/udev/gentoo/40-video.rules =================================================================== --- /dev/null +++ udev-git/etc/udev/gentoo/40-video.rules -@@ -0,0 +1,25 @@ +@@ -0,0 +1,24 @@ +# do not edit this file, it will be overwritten on update + +# video4linux @@ -66,8 +66,7 @@ Index: udev-git/etc/udev/gentoo/40-video.rules +# device node will be /dev/dri/card? +KERNEL=="card*", GROUP="video" +KERNEL=="nvidia*", GROUP="video" -+# drac thinks we do not need this. Please bug us if it is needed. -+#KERNEL=="3dfx*", GROUP="video" ++KERNEL=="3dfx*", GROUP="video" + +# Framebuffer +# do we need /dev/fb/0 really? diff --git a/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff b/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff new file mode 100644 index 000000000000..20b2bd800b16 --- /dev/null +++ b/sys-fs/udev/files/udev-115-fix-modprobe-calls.diff @@ -0,0 +1,23 @@ +Index: udev-git/etc/udev/gentoo/30-kernel-compat.rules +=================================================================== +--- udev-git.orig/etc/udev/gentoo/30-kernel-compat.rules ++++ udev-git/etc/udev/gentoo/30-kernel-compat.rules +@@ -34,13 +34,13 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_c + # sr: 4 TYPE_WORM, 5 TYPE_ROM + # st/osst: 1 TYPE_TAPE + +- ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod" +- ATTRS{type}=="4|5", RUN+="modprobe.sh sr_mod" +- ATTRS{type}=="8", RUN+="modprobe.sh ch" ++ ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" ++ ATTRS{type}=="4|5", RUN+="/sbin/modprobe sr_mod" ++ ATTRS{type}=="8", RUN+="/sbin/modprobe ch" + + ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ +- ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end" +- ATTRS{type}=="1", RUN+="modprobe.sh st" ++ ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end" ++ ATTRS{type}=="1", RUN+="/sbin/modprobe st" + + LABEL="kernel_compat_end" + diff --git a/sys-fs/udev/files/udev-start-115-r3.sh b/sys-fs/udev/files/udev-start-115-r3.sh new file mode 100644 index 000000000000..5073f8feb3bb --- /dev/null +++ b/sys-fs/udev/files/udev-start-115-r3.sh @@ -0,0 +1,196 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +tmpfs_size="10M" + +[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf + +mount_dev_directory() { + # Setup temporary storage for /dev + ebegin "Mounting /dev for udev" + if [ "${RC_USE_FSTAB}" = "yes" ] ; then + mntcmd=$(get_mount_fstab /dev) + else + unset mntcmd + fi + if [ -n "${mntcmd}" ] ; then + try mount -n ${mntcmd} + else + mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" + if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then + mntcmd="tmpfs" + else + mntcmd="ramfs" + fi + # many video drivers require exec access in /dev #92921 + try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev + fi + eend $? +} + +populate_udev() { + # populate /dev with devices already found by the kernel + + if get_bootparam "nocoldplug" ; then + RC_COLDPLUG="no" + ewarn "Skipping udev coldplug as requested in kernel cmdline" + fi + + # at this point we are already sure to use kernel 2.6.15 or newer + ebegin "Populating /dev with existing devices through uevents" + if [ "${RC_COLDPLUG}" = "yes" ]; then + /sbin/udevtrigger + else + # only create device nodes + /sbin/udevtrigger --attr-match=dev + # run persistent-net stuff, bug 191466 + /sbin/udevtrigger --subsystem-match=net + fi + eend $? + + # loop until everything is finished + # there's gotta be a better way... + ebegin "Letting udev process events" + /sbin/udevsettle --timeout=60 + eend $? + + rm -f /dev/.udev_populate + return 0 +} + +seed_dev() { + # Seed /dev with some things that we know we need + ebegin "Seeding /dev with needed nodes" + + # creating /dev/console and /dev/tty1 to be able to write + # to $CONSOLE with/without bootsplash before udevd creates it + [ ! -c /dev/console ] && mknod /dev/console c 5 1 + [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + [ ! -c /dev/null ] && mknod /dev/null c 1 3 + + # copy over any persistant things + if [ -d /lib/udev/devices ] ; then + cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null + fi + + # Not provided by sysfs but needed + ln -snf /proc/self/fd /dev/fd + ln -snf fd/0 /dev/stdin + ln -snf fd/1 /dev/stdout + ln -snf fd/2 /dev/stderr + [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core + + # Create problematic directories + mkdir -p /dev/pts /dev/shm + eend 0 +} + +unpack_device_tarball() { + # Actually get udev rolling + if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ + [ -s /lib/udev/state/devices.tar.bz2 ] ; then + ebegin "Populating /dev with saved device nodes" + try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev + eend $? + fi +} + +check_persistent_net() { + # check if there are problems with persistent-net + local syspath= + local devs= + local problem_found=0 + for syspath in /sys/class/net/*_rename*; do + if [ -d "${syspath}" ]; then + devs="${devs} ${syspath##*/}" + problem_found=1 + fi + done + + [ "${problem_found}" = 0 ] && return 0 + + eerror "UDEV: Your system has a problem assigning persistent names" + eerror "to these network interfaces: ${devs}" + + einfo "Checking persistent-net rules:" + # the sed-expression lists all duplicate lines + # from the input, like "uniq -d" does, but uniq + # is installed into /usr/bin and not available at boot. + dups=$( + RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + . /lib/udev/rule_generator.functions + find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' + ) + if [ -n "${dups}" ]; then + ewarn "The rules create multiple entries assigning these names:" + eindent + ewarn "${dups}" + eoutdent + else + ewarn "Found no duplicate names in persistent-net rules," + ewarn "there must be some other problem!" + fi + return 1 +} + +main() { + if [ $(get_KV) -le $(KV_to_int '2.6.14') ] ; 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 + + mount_dev_directory + + # Create a file so that our rc system knows it's still in sysinit. + # Existance means init scripts will not directly run. + # rc will remove the file when done with sysinit. + touch /dev/.rcsysinit + + # Selinux lovin; /selinux should be mounted by selinux-patched init + if [ -x /sbin/restorecon -a -c /selinux/null ] ; then + restorecon /dev > /selinux/null + fi + + unpack_device_tarball + seed_dev + + if [ -e /proc/sys/kernel/hotplug ] ; then + echo "" > /proc/sys/kernel/hotplug + fi + + ebegin "Starting udevd" + /sbin/udevd --daemon + eend $? + + /lib/udev/write_root_link_rule + populate_udev + + # Only do this for baselayout-1* + if [ ! -e /lib/librc.so ]; then + + # Create nodes that udev can't + ebegin "Finalizing udev configuration" + [ -x /sbin/lvm ] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ + /sbin/evms_activate -q &>/dev/null + eend 0 + fi + + check_persistent_net + + # trigger executing initscript when /etc is writable + IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null + + # udev started successfully + return 0 +} + +main + +# vim:ts=4 diff --git a/sys-fs/udev/files/udev.conf.post_115 b/sys-fs/udev/files/udev.conf.post_115 new file mode 100644 index 000000000000..42a08351d8e0 --- /dev/null +++ b/sys-fs/udev/files/udev.conf.post_115 @@ -0,0 +1,3 @@ +# The maximum size reserved for the tmpfs mounted on /dev +tmpfs_size="10M" + |