[gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-115-update-gentoo-rules-2.diff digest-udev-115-r6 udev.conf.115-r6 udev-start-115-r6.sh

[Matthias Schwarzott (zzam)]

zzam        07/09/24 19:59:39

  Added:                udev-115-update-gentoo-rules-2.diff
                        digest-udev-115-r6 udev.conf.115-r6
                        udev-start-115-r6.sh
  Log:
  Simplified rules a bit. Let user configure max inode nr of /dev, solving bug #193586.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.1                  sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff?rev=1.1&content-type=text/plain

Index: udev-115-update-gentoo-rules-2.diff
===================================================================
diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules
index 1cc31af..1db0aa7 100644
--- a/etc/udev/gentoo/65-permissions.rules
+++ b/etc/udev/gentoo/65-permissions.rules
@@ -18,3 +18,6 @@ SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE=
 KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
 KERNEL=="pilot",	GROUP="uucp"
 
+# sound devices (sound=alsa, snd=oss)
+SUBSYSTEM=="sound",	GROUP="audio"
+SUBSYSTEM=="snd",	GROUP="audio"



1.1                  sys-fs/udev/files/digest-udev-115-r6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/digest-udev-115-r6?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/digest-udev-115-r6?rev=1.1&content-type=text/plain

Index: digest-udev-115-r6
===================================================================
MD5 ac62cf56468db05bd37a5e7fed2823f6 udev-115-update-20070924.diff.bz2 22390
RMD160 3ce46440aba43088d1319ad5eb627c66abb75099 udev-115-update-20070924.diff.bz2 22390
SHA256 18e726afd833a827faf2ec7620051b7a142a50d712de132dbda213fc9d3e8021 udev-115-update-20070924.diff.bz2 22390
MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893



1.1                  sys-fs/udev/files/udev.conf.115-r6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev.conf.115-r6?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev.conf.115-r6?rev=1.1&content-type=text/plain

Index: udev.conf.115-r6
===================================================================
# The maximum size reserved for the tmpfs mounted on /dev
tmpfs_size="10M"

# The maximum number of inodes reserved for the tmpfs mounted on /dev
#tmpfs_inodes="4k"




1.1                  sys-fs/udev/files/udev-start-115-r6.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-115-r6.sh?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-start-115-r6.sh?rev=1.1&content-type=text/plain

Index: udev-start-115-r6.sh
===================================================================
# 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}"
		[ -n "${tmpfs_inodes}" ] && mntopts="${mntopts},nr_inodes=${tmpfs_inodes}"
		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



-- 
gentoo-commits@g.o mailing list