[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     ef1a1b64f1045ab8b8b45f2285a39692bfdc08d1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 16:29:47 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 16:29:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=ef1a1b64

Small style changes for consistency

---
 init.d/udev           |   10 ++++++----
 init.d/udev-postmount |   12 ++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index a5783d3..c881c6f 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -58,7 +58,8 @@ rules_disable_switch()
 }
 
 # only called on openrc
-is_service_enabled() {
+is_service_enabled()
+{
 	local svc="$1"
 
 	[ ! -e "/etc/init.d/${svc}" ] && return 1
@@ -161,7 +162,8 @@ stop_udevmonitor()
 	fi
 }
 
-display_hotplugged_services() {
+display_hotplugged_services()
+{
 	local svcfile= svc= services=
 	for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
 		svc="${svcfile##*/}"
@@ -262,9 +264,9 @@ _start()
 	return 0
 }
 
-stop() {
+stop()
+{
 	ebegin "Stopping udevd"
 	start-stop-daemon --stop --exec /sbin/udevd
 	eend $?
 }
-

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index 12a30f6..6f8c584 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -3,7 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.initd,v 1.1 2010/10/30 13:53:54 zzam Exp $
 
-depend() {
+depend()
+{
 	need localmount
 	after dbus # for trigger failed
 }
@@ -15,7 +16,8 @@ dir_writeable()
 
 # store persistent-rules that got created while booting
 # when / was still read-only
-store_persistent_rules() {
+store_persistent_rules()
+{
 	# only continue if rules-directory is writable
 	dir_writeable /etc/udev/rules.d || return 0
 
@@ -32,7 +34,8 @@ store_persistent_rules() {
 }
 
 
-start() {
+start()
+{
 	# check if this system uses udev
 	[ -d /dev/.udev/ ] || return 0
 
@@ -46,7 +49,8 @@ start() {
 	store_persistent_rules
 }
 
-stop() {
+stop()
+{
 	:
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     6c481daaea1c0a38333de77dc43f671ef400a21c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 18:01:32 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 18:01:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=6c481daa

Remove startup property

---
 init.d/udev |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index c881c6f..ed7c045 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -108,7 +108,6 @@ populate_dev()
 	fi
 
 	ebegin "Populating /dev with existing devices through uevents"
-	udevadm control --property=STARTUP=1
 	if yesno "${rc_coldplug}"; then
 		udevadm trigger --action="add"
 	else
@@ -132,7 +131,6 @@ populate_dev()
 	eend $?
 
 	udevadm control --property=do_not_run_plug_service=
-	udevadm control --property=STARTUP=
 	return 0
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     6083bcc3561ff50c58fe45b218649586c3b9f814
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 19:17:14 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 19:17:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=6083bcc3

move defaults to the top of the code

This was done to make the default settings of configurable values more
clear when looking at the code.

---
 init.d/udev       |   20 +++++++++++++-------
 init.d/udev-mount |    3 ++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index ed7c045..eef2776 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -6,7 +6,13 @@ description="Run udevd and create the device-nodes"
 
 [ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
+persistent_cd_disable="${persistent_cd_disable:-no}"
+persistent_net_disable="${persistent_net_disable:-no}"
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
+udev_debug="${udev_debug:-no}"
+udev_monitor="${udev_monitor:-no}"
+udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
+udev_settle_timeout="${udev_settle_timeout:-60}"
 
 depend()
 {
@@ -90,7 +96,7 @@ start_udevd()
 	local opts="${udev_opts}"
 
 	ebegin "Starting udevd"
-	if yesno "${udev_debug:-no}"; then
+	if yesno "${udev_debug}"; then
 		/sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log
 	else
 		start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
@@ -127,7 +133,7 @@ populate_dev()
 	#  * only using kernel created device nodes at boot (in /etc/fstab and elsewhere)
 	#
 	ebegin "Waiting for uevents to be processed"
-	udevadm settle --timeout=${udev_settle_timeout:-60}
+	udevadm settle --timeout=${udev_settle_timeout}
 	eend $?
 
 	udevadm control --property=do_not_run_plug_service=
@@ -137,7 +143,7 @@ populate_dev()
 # for debugging
 start_udevmonitor()
 {
-	yesno "${udev_monitor:-no}" || return 0
+	yesno "${udev_monitor}" || return 0
 
 	udevmonitor_log=/dev/.udev/udevmonitor.log
 	udevmonitor_pid=/dev/.udev/udevmonitor.pid
@@ -150,9 +156,9 @@ start_udevmonitor()
 
 stop_udevmonitor()
 {
-	yesno "${udev_monitor:-no}" || return 0
+	yesno "${udev_monitor}" || return 0
 
-	if yesno "${udev_monitor_keep_running:-no}"; then
+	if yesno "${udev_monitor_keep_running}"; then
 		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
 	else
 		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
@@ -246,8 +252,8 @@ _start()
 	fi
 
 	root_link
-	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}"
-	rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no}
+	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}"
+	rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable}
 	
 	disable_hotplug_agent
 	start_udevd || cleanup

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 3e4f884..248f6a7 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -4,6 +4,7 @@
 
 description="Mount tmpfs on /dev"
 [ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
+unreliable_kernel_warning="${unreliable_kernel_warning:-yes}"
 
 # get_KV and KV_to_int
 . /lib/udev/shell-compat-KV.sh
@@ -19,7 +20,7 @@ check_kernel()
 		return 1
 	fi
 
-	yesno "${unreliable_kernel_warning:-yes}" || return 0
+	yesno "${unreliable_kernel_warning}" || return 0
 
 	if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then
 		ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev."

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     11dda8627ed625c56cc93e920d4d31fa9204b9fb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 20:20:35 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 20:39:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=11dda862

make our population calls match upstreams recommendations

---
 init.d/udev |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index eef2776..671ad86 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -114,23 +114,18 @@ populate_dev()
 	fi
 
 	ebegin "Populating /dev with existing devices through uevents"
-	if yesno "${rc_coldplug}"; then
-		udevadm trigger --action="add"
-	else
+	if ! yesno "${rc_coldplug}"; then
 		# Do not run any init-scripts, Bug #206518
 		udevadm control --property=do_not_run_plug_service=1
-
-		# only create device nodes
-		udevadm trigger --action="add" --attr-match=dev
-
-		# run persistent-net stuff, bug 191466
-		udevadm trigger --action="add" --subsystem-match=net
 	fi
+	udevadm trigger --type=subsystems
+	udevadm trigger --type=devices
 	eend $?
 
 	# we can speed up booting under these conditions:
 	#  * using devtmpfs so kernel creates device nodes for us
-	#  * only using kernel created device nodes at boot (in /etc/fstab and elsewhere)
+	#  * only using kernel created device nodes at boot
+	# (in /etc/fstab and elsewhere)
 	#
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle --timeout=${udev_settle_timeout}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     74c98d36baf3ba7e4e677ebee5257a0313bf60bb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 21:19:54 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 21:21:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=74c98d36

remove deprecated call to udevadm trigger --type=failed

Upstream has deprecated this as of udev 173.
Also, the "after dbus" line can be removed from depend since it was
there because of failed events.

---
 init.d/udev-postmount |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index fc6f85c..c32c340 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -6,7 +6,6 @@
 depend()
 {
 	need localmount
-	after dbus # for trigger failed
 }
 
 dir_writeable()
@@ -42,9 +41,6 @@ start()
 
 	einfo "Doing udev cleanups"
 
-	# Run the events that failed at first udev trigger
-	udevadm trigger --type=failed -v
-
 	# store persistent-rules that got created while booting
 	# when / was still read-only
 	store_persistent_rules

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b1d575eca5fdcb3531ef48c00a2c812d34767360
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 16:51:16 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:51:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=b1d575ec

Udev service should query udev for runtime directory

The udev service was hard coding the runtime directory for udev instead
of querying it from udev.

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 9e6e2e7..a8ae4a6 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -31,7 +31,7 @@ depend()
 
 get_rundir()
 {
-	[ -e /run ] && RUNDIR=/run/udev || RUNDIR=/dev/.udev
+	RUNDIR=$(udevadm info --run)
 	echo "${RUNDIR}"
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     5d21f51c0d37d23c2aa871b0909e17c8464bb460
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 20:25:38 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 20:25:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=5d21f51c

Udev-postmount: make stop always succeed

---
 init.d/udev-postmount |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index c32c340..22e2582 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -48,7 +48,7 @@ start()
 
 stop()
 {
-	:
+	return 0
 }
 
 # vim:ts=4

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     7880e78fa77abf3086cdf593603e369728b1a997
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 19:26:40 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 19:26:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=7880e78f

The udev service should not read udev.conf

---
 init.d/udev |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index a8ae4a6..43db051 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -4,8 +4,6 @@
 
 description="Run udevd and create the device-nodes"
 
-[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-
 persistent_cd_disable="${persistent_cd_disable:-no}"
 persistent_net_disable="${persistent_net_disable:-no}"
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     79b0b62037b2c6f223019c580667a940b6084bba
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 03:09:33 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 03:19:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=79b0b620

Use default openrc stop function

This commit adds the command variable to the udev script which makes it
possible for us to use the default openrc stop function.

---
 init.d/udev |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 43db051..3dfd442 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,6 +2,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+command=/sbin/udevd
 description="Run udevd and create the device-nodes"
 
 persistent_cd_disable="${persistent_cd_disable:-no}"
@@ -266,10 +267,3 @@ _start()
 
 	return 0
 }
-
-stop()
-{
-	ebegin "Stopping udevd"
-	start-stop-daemon --stop --exec /sbin/udevd
-	eend $?
-}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     1dbe971168bcc3f28b730e81afc03fe6de531b57
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 18:58:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 18:58:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=1dbe9711

Move code from _start functions to start

The _start functions are no longer needed since they were called by the
addons.

---
 init.d/udev       |   10 ++--------
 init.d/udev-mount |    5 -----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 3dfd442..5ec0f23 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -238,15 +238,7 @@ start()
 	fi
 
 	check_openrc_net
-	_start
-	
-	display_hotplugged_services
-
-	return 0
-}
 
-_start()
-{
 	if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
 		ewarn "You should add udev-postmount service to your default runlevel."
 	fi
@@ -264,6 +256,8 @@ _start()
 
 	check_udev_works || cleanup
 	stop_udevmonitor
+	
+	display_hotplugged_services
 
 	return 0
 }

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 55a30a2..f81d82d 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -83,11 +83,6 @@ start()
 		return 1
 	fi
 
-	_start
-}
-
-_start()
-{
 	check_kernel || return 1
 	mount_dev_directory || return 1
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     91add723bd8e8d02ec04b712c01c01d980c9a9da
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 19:53:39 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 19:53:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=91add723

Improve rundir handling

Because of the way "udevadm info --run" works, we need to create
/run/udev if /run exists.

---
 init.d/udev |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 5ec0f23..1aa52cf 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -30,8 +30,14 @@ depend()
 
 get_rundir()
 {
-	RUNDIR=$(udevadm info --run)
-	echo "${RUNDIR}"
+	echo $(udevadm info --run)
+}
+
+make_rundir()
+{
+	if [ -d /run ]; then
+		checkpath -d -m 0755 -o root:root -q /run/udev
+	fi
 }
 
 cleanup()
@@ -237,6 +243,7 @@ start()
 		return 1
 	fi
 
+	make_rundir
 	check_openrc_net
 
 	if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b8869044d5851193adbea1e0dc76bf7f4d800f2c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 17:03:56 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 17:03:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=b8869044

Add back the --action=add switch

I was told on the linux-hotplug mailing list that the --action=add
switch is still needed for startup and the README for udev is out of
date.

---
 init.d/udev |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 1aa52cf..faf4218 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -129,8 +129,8 @@ populate_dev()
 		# Do not run any init-scripts, Bug #206518
 		udevadm control --property=do_not_run_plug_service=1
 	fi
-	udevadm trigger --type=subsystems
-	udevadm trigger --type=devices
+	udevadm trigger --type=subsystems --action=add
+	udevadm trigger --type=devices --action=add
 	eend $?
 
 	# we can speed up booting under these conditions:

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     9ea2be4850702a3484fc0aff6b20c816457a5d8b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 20:40:47 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 18:03:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=9ea2be48

Convert udev init script to work only with openrc

---
 init.d/udev |  176 +++++++++++++++++++++++------------------------------------
 1 files changed, 68 insertions(+), 108 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index faf4218..57aa580 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -3,6 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 command=/sbin/udevd
+command_args="--daemon ${udev_opts}"
 description="Run udevd and create the device-nodes"
 
 persistent_cd_disable="${persistent_cd_disable:-no}"
@@ -15,17 +16,12 @@ udev_settle_timeout="${udev_settle_timeout:-60}"
 
 depend()
 {
-	if [ -f /etc/init.d/sysfs ]; then
-		# require new enough openrc with sysinit being extra runlevel
-		# on linux we just check if sysfs init-script exists
-		# this is to silence out ugly warnings about not-existing sysfs script
-		provide dev
-		need sysfs udev-mount
-		before checkfs fsck
-
-		# udev does not work inside vservers
-		keyword novserver nolxc
-	fi
+	provide dev
+	need sysfs udev-mount
+	before checkfs fsck
+
+	# udev does not work inside vservers
+	keyword -vserver -lxc
 }
 
 get_rundir()
@@ -33,13 +29,6 @@ get_rundir()
 	echo $(udevadm info --run)
 }
 
-make_rundir()
-{
-	if [ -d /run ]; then
-		checkpath -d -m 0755 -o root:root -q /run/udev
-	fi
-}
-
 cleanup()
 {
 	# fail more gracely and not leave udevd running
@@ -47,18 +36,6 @@ cleanup()
 	exit 1
 }
 
-disable_hotplug_agent()
-{
-	if [ -e /proc/sys/kernel/hotplug ]; then
-		echo "" >/proc/sys/kernel/hotplug
-	fi
-}
-
-root_link()
-{
-	/lib/udev/write_root_link_rule
-}
-
 rules_disable_switch()
 {
 	# this function disables rules files
@@ -74,7 +51,6 @@ rules_disable_switch()
 	fi
 }
 
-# only called on openrc
 is_service_enabled()
 {
 	local svc="$1"
@@ -86,37 +62,59 @@ is_service_enabled()
 	return 1
 }
 
-check_openrc_net()
+start_pre()
 {
-	local f="$(get_rundir)/rules.d/90-network.rules"
-	is_service_enabled network || return 0
+	if [ -d /run ]; then
+		checkpath -d -m 0755 -o root:root -q /run/udev
+	fi
 
-	# disable network hotplugging
-	echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}"
-	echo "# as we use new-style network init script /etc/init.d/network" >> "${f}"
-}
+	if is_service_enabled network; then
+		# disable network hotplugging
+		local f="$(get_rundir)/rules.d/90-network.rules"
+		echo "# This file disables network hotplug events calling" >> "${F}"
+		echo "# old-style openrc net scripts" >> "${f}"
+		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
+	fi
 
-start_udevd()
-{
-	# load unix domain sockets if built as module, Bug #221253 and not yet loaded, Bug #363549
+	if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
+		ewarn "You should add udev-postmount service to your default runlevel."
+	fi
+
+	/lib/udev/write_root_link_rule
+
+	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}"
+	rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable}
+	
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+
+	# load unix domain sockets if built as module, Bug #221253
+	# and not yet loaded, Bug #363549
 	if [ ! -e /proc/net/unix ]; then
 		if ! modprobe unix; then
 			eerror "Cannot load the unix domain socket module"
 		fi
 	fi
-	local opts="${udev_opts}"
 
-	ebegin "Starting udevd"
 	if yesno "${udev_debug}"; then
-		/sbin/udevd --daemon ${opts} --debug 2>"$(get_rundir)"/udev.log
-	else
-		start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
+		command_args="${command_args} --debug 2> $(get_rundir)/udev.log"
 	fi
+}
 
-	eend $?
+start_udevmonitor()
+{
+	yesno "${udev_monitor}" || return 0
+
+	udevmonitor_log="$(get_rundir)/udevmonitor.log"
+	udevmonitor_pid="$(get_rundir)/udevmonitor.pid"
+
+	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
+	start-stop-daemon --start --stdout "${udevmonitor_log}" \
+		--make-pidfile --pidfile "${udevmonitor_pid}" \
+		--background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
 }
 
-# populate /dev with devices already found by the kernel
 populate_dev()
 {
 	if get_bootparam "nocoldplug" ; then
@@ -146,44 +144,6 @@ populate_dev()
 	return 0
 }
 
-# for debugging
-start_udevmonitor()
-{
-	yesno "${udev_monitor}" || return 0
-
-	udevmonitor_log="$(get_rundir)/udevmonitor.log"
-	udevmonitor_pid="$(get_rundir)/udevmonitor.pid"
-
-	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events"
-	start-stop-daemon --start --stdout "${udevmonitor_log}" \
-		--make-pidfile --pidfile "${udevmonitor_pid}" \
-		--background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
-}
-
-stop_udevmonitor()
-{
-	yesno "${udev_monitor}" || return 0
-
-	if yesno "${udev_monitor_keep_running}"; then
-		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
-	else
-		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
-		start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
-	fi
-}
-
-display_hotplugged_services()
-{
-	local svcfile= svc= services=
-	for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
-		svc="${svcfile##*/}"
-		[ -x "${svcfile}" ] || continue
-
-		services="${services} ${svc}"
-	done
-	[ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
-}
-
 check_persistent_net()
 {
 	# check if there are problems with persistent-net
@@ -234,37 +194,37 @@ check_udev_works()
 	return 0
 }
 
-start()
+stop_udevmonitor()
 {
-	# do not run this on old baselayout where udev-addon gets loaded
-	if [ ! -f /etc/init.d/sysfs ]; then
-		eerror "The $SVCNAME init-script is written for baselayout-2!"
-		eerror "Please do not use it with baselayout-1!".
-		return 1
+	yesno "${udev_monitor}" || return 0
+
+	if yesno "${udev_monitor_keep_running}"; then
+		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
+	else
+		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
+		start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
 	fi
+}
 
-	make_rundir
-	check_openrc_net
+display_hotplugged_services()
+{
+	local svcfile= svc= services=
+	for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
+		svc="${svcfile##*/}"
+		[ -x "${svcfile}" ] || continue
 
-	if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
-		ewarn "You should add udev-postmount service to your default runlevel."
-	fi
+		services="${services} ${svc}"
+	done
+	[ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
+}
 
-	root_link
-	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}"
-	rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable}
-	
-	disable_hotplug_agent
-	start_udevd || cleanup
+start_post()
+{
 	start_udevmonitor
-	populate_dev || cleanup
-
+	populate_dev
 	check_persistent_net
-
 	check_udev_works || cleanup
 	stop_udevmonitor
-	
 	display_hotplugged_services
-
 	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     573cf60eb9c4aa99a22f0cb9decae3a23010fd5c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 03:38:04 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 03:38:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=573cf60e

Make udev-postmount work correctly for all versions of udev

Udev-postmount can use udevadm --version to determine which version of
udev is running, so we should use that to determine when to run
udevadm trigger --type=failed instead of dropping it entirely.

---
 init.d/udev-postmount |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index 22e2582..41c14c1 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -1,11 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.initd,v 1.1 2010/10/30 13:53:54 zzam Exp $
+
+udev_version()
+{
+	echo $(udevadm --version)
+}
 
 depend()
 {
 	need localmount
+	if [ $(udev_version) -lt 175 ]; then
+		after dbus # for trigger failed
+	fi
 }
 
 dir_writeable()
@@ -32,7 +39,6 @@ store_persistent_rules()
 	done
 }
 
-
 start()
 {
 	RUNDIR=$(udevadm info --run)
@@ -41,6 +47,11 @@ start()
 
 	einfo "Doing udev cleanups"
 
+	if [ $(udev_version) -lt 175 ]; then
+		# Run the events that failed at first udev trigger
+		udevadm trigger --type=failed -v
+	fi
+
 	# store persistent-rules that got created while booting
 	# when / was still read-only
 	store_persistent_rules

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     da52d1e72135f43d94cfb8926b8ca2b1300c32e9
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 04:36:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 04:36:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=da52d1e7

Separate udev-mount service from udev

The udev-mount service needs to be separate from udev. It may be able to
be separated from these scripts entirely and put in openrc itself.

---
 init.d/udev       |   68 +----------------------------------------------------
 init.d/udev-mount |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 5e41bcc..2fc28fc 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -5,8 +5,6 @@
 command=/sbin/udevd
 command_args="--daemon ${udev_opts}"
 description="Run udevd and create the device-nodes"
-extra_commands="udev_mount"
-description_udev_mount="mount devtmpfs or tmpfs on /dev"
 
 persistent_cd_disable="${persistent_cd_disable:-no}"
 persistent_net_disable="${persistent_net_disable:-no}"
@@ -20,7 +18,7 @@ kv_min="${kb_min:-2.6.34}"
 depend()
 {
 	provide dev
-	need sysfs
+	need sysfs udev-mount
 	before checkfs fsck
 
 	# udev does not work inside vservers
@@ -83,69 +81,6 @@ cleanup()
 	exit 1
 }
 
-mount_dev_directory()
-{
-	if mountinfo -q /dev; then
-		if [ "${RC_CMD}" != "start" ]; then
-			einfo "/dev is already mounted"
-		fi
-		return 0
-	fi
-
-	# No options are processed here as they should all be in /etc/fstab
-	ebegin "Mounting /dev"
-	if ! fstabinfo --mount /dev; then
-		# we mount devtmpfs if supported
-		local fs=tmpfs
-		grep -qs devtmpfs /proc/filesystems && fs=devtmpfs
-
-		# Some devices require exec, Bug #92921
-		mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev
-	fi
-	eend $?
-}
-
-seed_dev()
-{
-	# Seed /dev with some things that we know we need
-
-	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-	# to $CONSOLE with/without bootsplash before udevd creates it
-	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-	# 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 -m 666 /dev/null c 1 3
-	${HAVE_SELINUX} && restorecon /dev/null
-
-	# so udev can add its start-message to dmesg
-	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-	# Create problematic directories
-	mkdir -p /dev/pts /dev/shm
-	${HAVE_SELINUX} && restorecon -R /dev >/dev/null
-	return 0
-}
-
-udev_mount()
-{
-	check_kernel || return 1
-	mount_dev_directory || return 1
-
-	# Selinux lovin; /selinux should be mounted by selinux-patched init
-	if [ -x /sbin/restorecon -a -c /selinux/null ]; then
-		HAVE_SELINUX=true
-		restorecon /dev > /selinux/null
-	else
-		HAVE_SELINUX=false
-	fi
-
-	seed_dev
-	return 0
-}
-
 rules_disable_switch()
 {
 	# this function disables rules files
@@ -190,7 +125,6 @@ start_pre()
 		ewarn "You should add udev-postmount service to your default runlevel."
 	fi
 
-	udev_mount || return 1
 	/lib/udev/write_root_link_rule
 
 	rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable}"

diff --git a/init.d/udev-mount b/init.d/udev-mount
new file mode 100644
index 0000000..bf08587
--- /dev/null
+++ b/init.d/udev-mount
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="mount devtmpfs or tmpfs on /dev"
+
+mount_dev_directory()
+{
+	if mountinfo -q /dev; then
+		einfo "/dev is already mounted"
+		return 0
+	fi
+
+	# No options are processed here as they should all be in /etc/fstab
+	ebegin "Mounting /dev"
+	if ! fstabinfo --mount /dev; then
+		# we mount devtmpfs if supported
+		local fs=tmpfs
+		grep -qs devtmpfs /proc/filesystems && fs=devtmpfs
+
+		# Some devices require exec, Bug #92921
+		mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev
+	fi
+	eend $?
+}
+
+seed_dev()
+{
+	# Seed /dev with some things that we know we need
+
+	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
+	# to $CONSOLE with/without bootsplash before udevd creates it
+	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
+	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
+	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
+
+	# 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 -m 666 /dev/null c 1 3
+	${HAVE_SELINUX} && restorecon /dev/null
+
+	# so udev can add its start-message to dmesg
+	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
+
+	# Create problematic directories
+	mkdir -p /dev/pts /dev/shm
+	${HAVE_SELINUX} && restorecon -R /dev >/dev/null
+	return 0
+}
+
+start()
+{
+	mount_dev_directory || return 1
+
+	# Selinux lovin; /selinux should be mounted by selinux-patched init
+	if [ -x /sbin/restorecon -a -c /selinux/null ]; then
+		HAVE_SELINUX=true
+		restorecon /dev > /selinux/null
+	else
+		HAVE_SELINUX=false
+	fi
+
+	seed_dev
+	return 0
+}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     38bb62cf141070cc62ee1052abecd6dcaa9d74c1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 19:45:45 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 19:45:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=38bb62cf

add -lxc and -vserver keywords to udev-mount and udev-postmount

udev-mount and udev-postmount do not run in vserver or lxc environments.

---
 init.d/udev-mount     |    5 +++++
 init.d/udev-postmount |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index bf08587..62742bd 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -4,6 +4,11 @@
 
 description="mount devtmpfs or tmpfs on /dev"
 
+depend()
+{
+	keyword -vserver -lxc
+}
+
 mount_dev_directory()
 {
 	if mountinfo -q /dev; then

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index 41c14c1..d689681 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -13,6 +13,7 @@ depend()
 	if [ $(udev_version) -lt 175 ]; then
 		after dbus # for trigger failed
 	fi
+	keyword -vserver -lxc
 }
 
 dir_writeable()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     0e27668560b3c139a3b6ea16ce5818378c0952a8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 15:43:04 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:43:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=0e276685

Fix typo

I would like to thank Jeroen Roovers <jer <AT> gentoo.org>
for finding this.

Reported-by: mads <mads <AT> ab3.no>
X-Gentoo-Bug: 395519
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=395519

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 2fc28fc..07ce9d1 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -116,7 +116,7 @@ start_pre()
 	if is_service_enabled network; then
 		# disable network hotplugging
 		local f="$(get_rundir)/rules.d/90-network.rules"
-		echo "# This file disables network hotplug events calling" >> "${F}"
+		echo "# This file disables network hotplug events calling" >> "${f}"
 		echo "# old-style openrc net scripts" >> "${f}"
 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     8b6ebd414edec59d31ed413dfa8f7e7cd09bc8c8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 23:56:41 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 23:56:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=8b6ebd41

udev-mount: require devtmpfs

Upstream udev now requires that a devtmpfs be mounted on /dev, so we
require this as well.

---
 init.d/udev-mount |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 62742bd..096e710 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -2,7 +2,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-description="mount devtmpfs or tmpfs on /dev"
+description="mount devtmpfs on /dev"
 
 depend()
 {
@@ -11,22 +11,36 @@ depend()
 
 mount_dev_directory()
 {
-	if mountinfo -q /dev; then
+	local rc=0
+
+	if mountinfo -q -f devtmpfs /dev; then
 		einfo "/dev is already mounted"
 		return 0
 	fi
 
+	# If an entry for /dev exists in fstab it must be a devtmpfs.
+	if fstabinfo -q /dev && ! fstabinfo -q -f devtmpfs /dev; then
+		eerror "The entry in /etc/fstab is not correct."
+		eerror "Udev requires it to be a devtmpfs file system."
+		return 1
+	fi
+
 	# No options are processed here as they should all be in /etc/fstab
 	ebegin "Mounting /dev"
 	if ! fstabinfo --mount /dev; then
-		# we mount devtmpfs if supported
-		local fs=tmpfs
-		grep -qs devtmpfs /proc/filesystems && fs=devtmpfs
-
-		# Some devices require exec, Bug #92921
-		mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev
+		if grep -qs devtmpfs /proc/filesystems; then
+			# Some devices require exec, Bug #92921
+			mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
+			rc=$?
+		else
+			eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
+			eerror "This means that CONFIG_DEVTMPFS=y is required"
+			eerror "in the kernel configuration."
+			return 1
+		fi
 	fi
-	eend $?
+
+	eend $rc
 }
 
 seed_dev()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     60968944c2c68ad3ded3ae3361a73c13b6482753
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 16:20:41 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 16:20:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=60968944

Clarify the description of udev

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 07ce9d1..d172f96 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -4,7 +4,7 @@
 
 command=/sbin/udevd
 command_args="--daemon ${udev_opts}"
-description="Run udevd and create the device-nodes"
+description="udev manages device permissions and symbolic links in /dev"
 
 persistent_cd_disable="${persistent_cd_disable:-no}"
 persistent_net_disable="${persistent_net_disable:-no}"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     8d3e96f760deab72c79707d16d6ca085c38e1dc8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 17:36:09 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 17:36:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=8d3e96f7

udev: add reload command to reload kernel module configuration

Reported-by: Mike Frysinger <vapier <AT> gentoo.org>
X-Gentoo-Bug: 397471
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397471

---
 init.d/udev |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index d172f96..6f3174b 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -6,6 +6,9 @@ command=/sbin/udevd
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 
+extra_started_commands="reload"
+description_reload="reload udev kernel module configuration"
+
 persistent_cd_disable="${persistent_cd_disable:-no}"
 persistent_net_disable="${persistent_net_disable:-no}"
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
@@ -273,3 +276,10 @@ start_post()
 	display_hotplugged_services
 	return 0
 }
+
+reload()
+{
+	ebegin "reloading udev kernel module configuration"
+	udevadm --reload
+	eend $?
+}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     298a952db5a4726185d857699591da09ff589b64
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 20:08:53 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 20:08:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=298a952d

Fix location of udevd

With >= udev 176, udevd is now in /lib/udev, so update the startup
script accordingly.

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 6f3174b..b7a80c7 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command=/sbin/udevd
+command=/lib/udev/udevd
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     bce3476f1a1e33a4fc43c23badcff5f81fd9b137
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 17:29:26 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 17:29:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=bce3476f

udev: remove broken reload function

---
 init.d/udev |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index b7a80c7..196eff2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -6,9 +6,6 @@ command=/lib/udev/udevd
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 
-extra_started_commands="reload"
-description_reload="reload udev kernel module configuration"
-
 persistent_cd_disable="${persistent_cd_disable:-no}"
 persistent_net_disable="${persistent_net_disable:-no}"
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
@@ -276,10 +273,3 @@ start_post()
 	display_hotplugged_services
 	return 0
 }
-
-reload()
-{
-	ebegin "reloading udev kernel module configuration"
-	udevadm --reload
-	eend $?
-}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     6da703162d58b673dfbd23b6a3e0cb3e5a6688d4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 18:59:14 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 19:01:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=6da70316

Typo Fix

x-Gentoo-Bug:403431
x-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=403431

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 196eff2..eca161b 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -13,7 +13,7 @@ udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
-kv_min="${kb_min:-2.6.34}"
+kv_min="${kv_min:-2.6.34}"
 
 depend()
 {

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     0ed42d35995bc6c35a6b6fe02a5164c4fa73a71c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 21:58:40 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 21:58:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=0ed42d35

fix mounting logic in udev-mount

Udev-mount now follows the following logic:

1. If there is an entry in fstab for /dev:
a. If /dev is mounted, remount it according to fstab.
b. Otherwise, mount it according to fstab.

2. Otherwise, if /dev is not mounted:
a. Mount it with default settings.
B. Otherwise, output a message and use the mounted /dev.

Reported-by: duncan <1i5t5.duncan <AT> cox.net>
X-Gentoo-Bug: 402845
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=402845

---
 init.d/udev-mount |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 096e710..676643f 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -11,33 +11,34 @@ depend()
 
 mount_dev_directory()
 {
-	local rc=0
+	local mounted=false fstab=false action=--mount msg=Mounting rc=0
 
-	if mountinfo -q -f devtmpfs /dev; then
-		einfo "/dev is already mounted"
-		return 0
+	if ! grep -qs devtmpfs /proc/filesystems; then
+		eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
+		eerror "This means that CONFIG_DEVTMPFS=y is required"
+		eerror "in the kernel configuration."
+		return 1
 	fi
 
+	# Is /dev already a mounted devtmpfs?
+	mountinfo -q -f devtmpfs /dev && mounted=true
+
 	# If an entry for /dev exists in fstab it must be a devtmpfs.
-	if fstabinfo -q /dev && ! fstabinfo -q -f devtmpfs /dev; then
-		eerror "The entry in /etc/fstab is not correct."
-		eerror "Udev requires it to be a devtmpfs file system."
-		return 1
-	fi
+	fstabinfo -q -t devtmpfs /dev && fstab=true
 
 	# No options are processed here as they should all be in /etc/fstab
-	ebegin "Mounting /dev"
-	if ! fstabinfo --mount /dev; then
-		if grep -qs devtmpfs /proc/filesystems; then
-			# Some devices require exec, Bug #92921
-			mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
-			rc=$?
-		else
-			eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
-			eerror "This means that CONFIG_DEVTMPFS=y is required"
-			eerror "in the kernel configuration."
-			return 1
-		fi
+	if $fstab; then
+		$mounted && action=--remount && msg=Remounting
+		ebegin "$msg /dev according to /etc/fstab"
+		fstabinfo $action /dev
+		rc=$?
+	elif ! $mounted; then
+		ebegin "Mounting /dev"
+		# Some devices require exec, Bug #92921
+		mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
+		rc=$?
+	else
+		ebegin "Using /dev mounted from kernel"
 	fi
 
 	eend $rc

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[Matthias Schwarzott]

commit:     776e2356579048925513e2aa79ab5ee591904d72
Author:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 17:08:55 2011 +0000
Commit:     Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 21:37:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=776e2356

Simplify udev version query

---
 init.d/udev-postmount |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
index d689681..fcf5864 100644
--- a/init.d/udev-postmount
+++ b/init.d/udev-postmount
@@ -4,7 +4,7 @@
 
 udev_version()
 {
-	echo $(udevadm --version)
+	udevadm --version
 }
 
 depend()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     d28372af8ef3be4753c43d3fd6a705f788077a1d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 18:43:19 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 18:43:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=d28372af

udev: do not hard code path to udevd in cleanup function

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index eca161b..7316f3c 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -77,7 +77,7 @@ get_rundir()
 cleanup()
 {
 	# fail more gracely and not leave udevd running
-	start-stop-daemon --stop --exec /sbin/udevd
+	start-stop-daemon --stop --exec ${command}
 	exit 1
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     355b26f0406ee47281b7a2bcbadd05c2067567da
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 16:33:51 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May  1 16:33:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=355b26f0

udev-mount: allow recovery if devtmpfs is not available

Now we mount a tmpfs on /dev if devtmpfs is not available.
This will allow logins so that it is possible to recover. However, udev
is still down and will be until the user fixes their kernel. I would
like to thank Mike Frysinger <vapier <AT> gentoo.org> for the suggestion for
this.

---
 init.d/udev-mount |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 676643f..515c44d 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -14,9 +14,14 @@ mount_dev_directory()
 	local mounted=false fstab=false action=--mount msg=Mounting rc=0
 
 	if ! grep -qs devtmpfs /proc/filesystems; then
-		eerror "Udev uses a devtmpfs mounted on /dev to manage devices."
-		eerror "This means that CONFIG_DEVTMPFS=y is required"
-		eerror "in the kernel configuration."
+		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
+		eerror "for this version of udev to run successfully."
+		eerror "This requires immediate attention."
+		if ! mountinfo -q /dev; then
+			mount -t tmpfs dev /dev
+			busybox mdev -s
+			mkdir /dev/pts
+		fi
 		return 1
 	fi
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     567a45b9d029f3330f579cdbed4b81231642f8e7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 16:56:37 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May  1 16:56:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=567a45b9

udev-mount: add -n call to mount for temporary /dev

This is needed because / is read only when this script is run.

---
 init.d/udev-mount |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index 515c44d..ab58c3d 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -18,7 +18,7 @@ mount_dev_directory()
 		eerror "for this version of udev to run successfully."
 		eerror "This requires immediate attention."
 		if ! mountinfo -q /dev; then
-			mount -t tmpfs dev /dev
+			mount -n -t tmpfs dev /dev
 			busybox mdev -s
 			mkdir /dev/pts
 		fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     bb56587f26ae0fa084271ff685ac5b7296c23553
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:21:53 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 23:28:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=bb56587f

fix path to daemon

In udev-185 and newer, the daemon has been moved to
/usr/lib/systemd/systemd-udevd.

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 7316f3c..265523a 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command=/lib/udev/udevd
+command=/usr/lib/systemd/systemd-udevd
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     1dedf28fb80d4a206001fbb96714bc6f6d8b7ee4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:32:27 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 23:32:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=1dedf28f

do not create /run/udev

We do not need to create this directory since udev handles it.

---
 init.d/udev |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 2adee63..ff53537 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -92,10 +92,6 @@ is_service_enabled()
 
 start_pre()
 {
-	if [ -d /run ]; then
-		checkpath -d -m 0755 -o root:root -q /run/udev
-	fi
-
 	if is_service_enabled network; then
 		# disable network hotplugging
 		local f="$(get_rundir)/rules.d/90-network.rules"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     4015c45dbdcb3207bb428d13ee0bc965afa978b1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:36:44 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 23:36:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=4015c45d

remove udev-postmount

Since the persistent net and cd rules generators are removed, there is
no longer a function for udev-postmount.

---
 init.d/udev           |    4 ---
 init.d/udev-postmount |   66 -------------------------------------------------
 2 files changed, 0 insertions(+), 70 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index ff53537..2541a0c 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -100,10 +100,6 @@ start_pre()
 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
 	fi
 
-	if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
-		ewarn "You should add udev-postmount service to your default runlevel."
-	fi
-
 	/lib/udev/write_root_link_rule
 
 	if [ -e /proc/sys/kernel/hotplug ]; then

diff --git a/init.d/udev-postmount b/init.d/udev-postmount
deleted file mode 100644
index fcf5864..0000000
--- a/init.d/udev-postmount
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-udev_version()
-{
-	udevadm --version
-}
-
-depend()
-{
-	need localmount
-	if [ $(udev_version) -lt 175 ]; then
-		after dbus # for trigger failed
-	fi
-	keyword -vserver -lxc
-}
-
-dir_writeable()
-{
-        touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$
-}
-
-# store persistent-rules that got created while booting
-# when / was still read-only
-store_persistent_rules()
-{
-	# only continue if rules-directory is writable
-	dir_writeable /etc/udev/rules.d || return 0
-
-	local file dest
-	for file in "${RUNDIR}"/tmp-rules--*; do
-		dest=${file##*tmp-rules--}
-		[ "$dest" = '*' ] && break
-		type=${dest##70-persistent-}
-		type=${type%%.rules}
-		ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d"
-		cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file"
-		eend $? "Failed moving persistent rules!"
-	done
-}
-
-start()
-{
-	RUNDIR=$(udevadm info --run)
-	# check if this system uses udev
-	[ -d "${RUNDIR}" ] || return 0
-
-	einfo "Doing udev cleanups"
-
-	if [ $(udev_version) -lt 175 ]; then
-		# Run the events that failed at first udev trigger
-		udevadm trigger --type=failed -v
-	fi
-
-	# store persistent-rules that got created while booting
-	# when / was still read-only
-	store_persistent_rules
-}
-
-stop()
-{
-	return 0
-}
-
-# vim:ts=4

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     1ad426d24f94706e8578a5a0f0d0457405abc06c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 21:06:15 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 21:06:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=1ad426d2

udev-mount: remove selinux code

I was advised that this code is no longer needed since this issue is
being controlled by the selinux policy.
Thanks to Sven Vermeulen.

---
 init.d/udev-mount |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/init.d/udev-mount b/init.d/udev-mount
index ab58c3d..fa3afb3 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -62,14 +62,12 @@ seed_dev()
 	# 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 -m 666 /dev/null c 1 3
-	${HAVE_SELINUX} && restorecon /dev/null
 
 	# so udev can add its start-message to dmesg
 	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
 
 	# Create problematic directories
 	mkdir -p /dev/pts /dev/shm
-	${HAVE_SELINUX} && restorecon -R /dev >/dev/null
 	return 0
 }
 
@@ -77,14 +75,6 @@ start()
 {
 	mount_dev_directory || return 1
 
-	# Selinux lovin; /selinux should be mounted by selinux-patched init
-	if [ -x /sbin/restorecon -a -c /selinux/null ]; then
-		HAVE_SELINUX=true
-		restorecon /dev > /selinux/null
-	else
-		HAVE_SELINUX=false
-	fi
-
 	seed_dev
 	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     2967225819acc43adb3cbb62d558183e5f5a022e
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 15:44:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 15:44:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=29672258

add caching to get_rundir

The get_rundir function should only run udevadm the first time it is
called.

---
 init.d/udev |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 9eb74bd..365f78a 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -67,9 +67,14 @@ check_kernel()
 	return 0
 }
 
+_RC_GET_RUNDIR_CACHE=
 get_rundir()
 {
-	echo $(udevadm info --run)
+	if [ -z "$_RC_GET_RUNDIR_CACHE" ]; then
+		_RC_GET_RUNDIR_CACHE="$(udevadm info --run)"
+	fi
+	echo "$_RC_GET_RUNDIR_CACHE"
+	return 0
 }
 
 cleanup()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     8558d209a84d515a0c3e2992ed5a9ec2a3aea014
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 16:24:01 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 16:24:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=8558d209

remove check_udev_works and cleanup functions

The check_udev_works function used a test which is no longer valid
since udev doesn't create device nodes. Also, there is not a need for
the cleanup function since if udev doesn't start start_post will never
be called.

---
 init.d/udev |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 365f78a..ba5b25f 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -77,13 +77,6 @@ get_rundir()
 	return 0
 }
 
-cleanup()
-{
-	# fail more gracely and not leave udevd running
-	start-stop-daemon --stop --exec ${command}
-	exit 1
-}
-
 is_service_enabled()
 {
 	local svc="$1"
@@ -164,16 +157,6 @@ populate_dev()
 	return 0
 }
 
-check_udev_works()
-{
-	# should exist on every system, else udev failed
-	if [ ! -e /dev/zero ]; then
-		eerror "Assuming udev failed somewhere, as /dev/zero does not exist."
-		return 1
-	fi
-	return 0
-}
-
 stop_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0
@@ -202,7 +185,6 @@ start_post()
 {
 	start_udevmonitor
 	populate_dev
-	check_udev_works || cleanup
 	stop_udevmonitor
 	display_hotplugged_services
 	return 0

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     3c096a7efc4f8cb45938045c6e92bb827f4602cc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 20:58:43 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 20:58:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=3c096a7e

disable oldnet hotplug after udev starts

The /run/udev/rules.d directory does not exist until after udev starts,
so we can't disable hotplugging until then.

---
 init.d/udev |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index a054800..d2dd746 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -67,6 +67,25 @@ check_kernel()
 	return 0
 }
 
+start_pre()
+{
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+
+	# load unix domain sockets if built as module, Bug #221253
+	# and not yet loaded, Bug #363549
+	if [ ! -e /proc/net/unix ]; then
+		if ! modprobe unix; then
+			eerror "Cannot load the unix domain socket module"
+		fi
+	fi
+
+	if yesno "${udev_debug}"; then
+		command_args="${command_args} --debug 2> /run/udevdebug.log"
+	fi
+}
+
 is_service_enabled()
 {
 	local svc="$1"
@@ -78,7 +97,7 @@ is_service_enabled()
 	return 1
 }
 
-start_pre()
+disable_oldnet_hotplug()
 {
 	if is_service_enabled network; then
 		# disable network hotplugging
@@ -87,22 +106,6 @@ start_pre()
 		echo "# old-style openrc net scripts" >> "${f}"
 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
 	fi
-
-	if [ -e /proc/sys/kernel/hotplug ]; then
-		echo "" >/proc/sys/kernel/hotplug
-	fi
-
-	# load unix domain sockets if built as module, Bug #221253
-	# and not yet loaded, Bug #363549
-	if [ ! -e /proc/net/unix ]; then
-		if ! modprobe unix; then
-			eerror "Cannot load the unix domain socket module"
-		fi
-	fi
-
-	if yesno "${udev_debug}"; then
-		command_args="${command_args} --debug 2> /run/udevdebug.log"
-	fi
 }
 
 start_udevmonitor()
@@ -173,6 +176,7 @@ display_hotplugged_services()
 
 start_post()
 {
+	disable_oldnet_hotplug
 	start_udevmonitor
 	populate_dev
 	stop_udevmonitor

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     bc71a9b26f25bbbcac07d26b30b6306b7b1c7263
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 19:57:25 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 19:57:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=bc71a9b2

remove get_rundir function

In>=udev-186, /run is assumed to exist, and the udevadm info --run
option is no longer valid.

---
 init.d/udev |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index ba5b25f..a054800 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -67,16 +67,6 @@ check_kernel()
 	return 0
 }
 
-_RC_GET_RUNDIR_CACHE=
-get_rundir()
-{
-	if [ -z "$_RC_GET_RUNDIR_CACHE" ]; then
-		_RC_GET_RUNDIR_CACHE="$(udevadm info --run)"
-	fi
-	echo "$_RC_GET_RUNDIR_CACHE"
-	return 0
-}
-
 is_service_enabled()
 {
 	local svc="$1"
@@ -92,7 +82,7 @@ start_pre()
 {
 	if is_service_enabled network; then
 		# disable network hotplugging
-		local f="$(get_rundir)/rules.d/90-network.rules"
+		local f="/run/udev/rules.d/90-network.rules"
 		echo "# This file disables network hotplug events calling" >> "${f}"
 		echo "# old-style openrc net scripts" >> "${f}"
 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
@@ -111,7 +101,7 @@ start_pre()
 	fi
 
 	if yesno "${udev_debug}"; then
-		command_args="${command_args} --debug 2> $(get_rundir)/udev.log"
+		command_args="${command_args} --debug 2> /run/udevdebug.log"
 	fi
 }
 
@@ -119,8 +109,8 @@ start_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0
 
-	udevmonitor_log="$(get_rundir)/udevmonitor.log"
-	udevmonitor_pid="$(get_rundir)/udevmonitor.pid"
+	udevmonitor_log=/run/udevmonitor.log
+	udevmonitor_pid=/run/udevmonitor.pid
 
 	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
 	start-stop-daemon --start --stdout "${udevmonitor_log}" \

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     da049625212109a1a6f16ba1f48c87d5f972f410
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 21:03:57 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 21:03:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=da049625

abort if the kernel version is too old

---
 init.d/udev |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index d2dd746..9e8ff76 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -69,6 +69,7 @@ check_kernel()
 
 start_pre()
 {
+	check_kernel || return 1
 	if [ -e /proc/sys/kernel/hotplug ]; then
 		echo "" >/proc/sys/kernel/hotplug
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     89c2380217053bfbc7769f95124102d07db94976
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 16:21:05 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 16:21:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=89c23802

Add reload command for bug #403217

---
 init.d/udev |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 33b0335..5247b84 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -5,6 +5,8 @@
 command=/usr/lib/systemd/systemd-udevd
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
+extra_started_commands="reload"
+description_reload="Reload the udev rules and databases"
 
 rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
 udev_debug="${udev_debug:-no}"
@@ -177,3 +179,10 @@ start_post()
 	display_hotplugged_services
 	return 0
 }
+
+reload()
+{
+	ebegin "reloading udev rules and databases"
+	udevadm control --reload
+	eend $?
+}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[Robin H. Johnson]

commit:     a7478e28187b6ed356666987a4a2080e1a7e19e4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 21:43:12 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 21:43:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=a7478e28

init.d/udev*: dev-mount virtual dep

Add in the dev-mount virtual dep for the tmpfiles.d work.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 init.d/udev       |    2 ++
 init.d/udev-mount |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 5247b84..520b91e 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -17,6 +17,8 @@ kv_min="${kv_min:-2.6.34}"
 
 depend()
 {
+	# we depend on udev-mount explicitly, not dev-mount generic as we don't
+	# want mdev as a dev-mount provider to come in.
 	provide dev
 	need sysfs udev-mount
 	before checkfs fsck

diff --git a/init.d/udev-mount b/init.d/udev-mount
index fa3afb3..b41a637 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -6,6 +6,7 @@ description="mount devtmpfs on /dev"
 
 depend()
 {
+	provide dev-mount
 	keyword -vserver -lxc
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     250fc14433c92e1d170fbe9ca3acf48bcba6265f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Nov 24 04:32:03 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 04:32:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=250fc144

udev: start /sbin/udevd if it exists

This was added so that the eudev fork can use the udev-init-scriptss
package.

X-Gentoo-Bug: 444396
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=444396

---
 init.d/udev |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 520b91e..3dbc1a4 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command=/usr/lib/systemd/systemd-udevd
+if [ -x /sbin/udevd ]; then
+	command=/sbin/udevd
+else
+	command=/usr/lib/systemd/systemd-udevd
+fi
+
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     26501ff94ed36a87f982267f2767508ddbd823c7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 21:19:33 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 21:19:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=26501ff9

udev: add a stop function

The udev init script should use "udevadm control --exit" as the way to
stop udev, so this adds a custom stop function.
Thanks to Mike Gilbert <floppym <AT> gentoo.org> for pointing this out.

---
 init.d/udev |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 3dbc1a4..d61f1e2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -187,6 +187,13 @@ start_post()
 	return 0
 }
 
+stop()
+{
+	ebegin "Stopping ${name:-$RC_SVCNAME}"
+	udevadm control --exit
+	eend $? "Failed to stop $RC_SVCNAME"
+}
+
 reload()
 {
 	ebegin "reloading udev rules and databases"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     a174eb4ed5e9845c5631cadd739297aaaa21eb15
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 21:49:22 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 21:49:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=a174eb4e

udev: move the code to search for the binary to start_pre

This does not need to be in global scope since the only place the
command variable is used is the start function.

---
 init.d/udev |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index d61f1e2..c25e586 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,12 +2,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-if [ -x /sbin/udevd ]; then
-	command=/sbin/udevd
-else
-	command=/usr/lib/systemd/systemd-udevd
-fi
-
 command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
@@ -94,6 +88,13 @@ start_pre()
 	if yesno "${udev_debug}"; then
 		command_args="${command_args} --debug 2> /run/udevdebug.log"
 	fi
+
+	if [ -x /sbin/udevd ]; then
+		command=/sbin/udevd
+	else
+		command=/usr/lib/systemd/systemd-udevd
+	fi
+	return 0
 }
 
 is_service_enabled()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     39c5e854a0400eb9b0c960d40d679a1fc7f1a71b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 21:54:40 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 21:54:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=39c5e854

udev: fail if unable to load the socket module

---
 init.d/udev |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index c25e586..601523c 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -82,6 +82,7 @@ start_pre()
 	if [ ! -e /proc/net/unix ]; then
 		if ! modprobe unix; then
 			eerror "Cannot load the unix domain socket module"
+			return 1
 		fi
 	fi
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     8964355fedad5139b34cedda44c6e7275b1314c4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 23:21:22 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 23:21:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=8964355f

update copyright notices

---
 init.d/udev       |    2 +-
 init.d/udev-mount |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 601523c..e04001a 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 command_args="--daemon ${udev_opts}"

diff --git a/init.d/udev-mount b/init.d/udev-mount
index b41a637..a868340 100644
--- a/init.d/udev-mount
+++ b/init.d/udev-mount
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="mount devtmpfs on /dev"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     9623860af69273675697087a6834c2a37d7ef0c1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 20:00:38 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 20:00:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=9623860a

udev: start udev from /lib/systemd if it exists there.

---
 init.d/udev |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index e04001a..3459203 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -90,10 +90,14 @@ start_pre()
 		command_args="${command_args} --debug 2> /run/udevdebug.log"
 	fi
 
-	if [ -x /sbin/udevd ]; then
-		command=/sbin/udevd
-	else
-		command=/usr/lib/systemd/systemd-udevd
+	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
+	for f in ${bins}; do
+		if [ -x "$f" ]; then
+			command="$f"
+		fi
+	done
+	if [ -n "$command" ]; then
+		command=/lib/systemd/systemd-udevd
 	fi
 	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     6a50f98947ea9b7173b2cbefec15e796e5b791fc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 21:58:29 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 21:58:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=6a50f989

udev: return error if unable to find executable

---
 init.d/udev |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 3459203..10adca2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -96,8 +96,9 @@ start_pre()
 			command="$f"
 		fi
 	done
-	if [ -n "$command" ]; then
-		command=/lib/systemd/systemd-udevd
+	if [ -z "$command" ]; then
+		eerror "Unable to find udev executable."
+		return 1
 	fi
 	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b165050513894b3d600e8302bd68c7ba553fbb04
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 16:37:34 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 16:37:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=b1650505

udev: only run the executable

Thanks to Samuli Suominen for catching this.

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 10adca2..bb97b7c 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -92,7 +92,7 @@ start_pre()
 
 	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
-		if [ -x "$f" ]; then
+		if [ -x "$f" -a ! -L "$f" ]; then
 			command="$f"
 		fi
 	done

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     2af15ef2231161205a25723fefd9e8fc910f854d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 19:27:49 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 19:27:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=2af15ef2

Add code to stop udevd if udevadm control --exit fails

Thanks to Nikoli for pointing this out.

---
 init.d/udev |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index bb97b7c..342b3af 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -196,9 +196,17 @@ start_post()
 
 stop()
 {
+	local rc=0
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	udevadm control --exit
-	eend $? "Failed to stop $RC_SVCNAME"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eend $rc "Failed to stop $RC_SVCNAME using udevadm"
+		ebegin "Trying with start-stop-daemon"
+		start-stop-daemon --stop --exec /sbin/udevd
+		rc=$?
+	fi
+	eend $rc "Failed to stop $RC_SVCNAME"
 }
 
 reload()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     72685c836e468e6de8db0da83a32dbde448c4d22
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 18:55:25 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 18:55:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=72685c83

move disable_oldnet_hotplug above start_pre

This function is used in start_pre, so move it to reflect that. Code is
easier to follow if it is defined before it is used.

---
 init.d/udev |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 0a95873..193adf7 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -70,6 +70,19 @@ check_kernel()
 	return 0
 }
 
+disable_oldnet_hotplug()
+{
+	if is_service_enabled network; then
+		# disable network hotplugging
+		local d="/run/udev/rules.d"
+		mkdir -p "${d}"
+		local f="${d}/90-network.rules"
+		echo "# This file disables network hotplug events calling" >> "${f}"
+		echo "# old-style openrc net scripts" >> "${f}"
+		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
+	fi
+}
+
 start_pre()
 {
 	check_kernel || return 1
@@ -118,19 +131,6 @@ is_service_enabled()
 	return 1
 }
 
-disable_oldnet_hotplug()
-{
-	if is_service_enabled network; then
-		# disable network hotplugging
-		local d="/run/udev/rules.d"
-		mkdir -p "${d}"
-		local f="${d}/90-network.rules"
-		echo "# This file disables network hotplug events calling" >> "${f}"
-		echo "# old-style openrc net scripts" >> "${f}"
-		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
-	fi
-}
-
 start_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     cf827df7dfa33ebcd5cd0ed0ad7c30c78a0a1cb1
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 15:29:53 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 18:28:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=cf827df7

Fix population of /run/udev/rules.d for newnet

* Create /run/udev/rules.d before dropping files in place.
* Move disable_oldnet_hotplug to start_pre so that it is done before
starting the daemon

http://bugs.gentoo.org/453656

---
 init.d/udev |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 342b3af..0a95873 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -100,6 +100,10 @@ start_pre()
 		eerror "Unable to find udev executable."
 		return 1
 	fi
+
+	# Need to do this before starting udev so it will load the rules.
+	disable_oldnet_hotplug
+
 	return 0
 }
 
@@ -118,7 +122,9 @@ disable_oldnet_hotplug()
 {
 	if is_service_enabled network; then
 		# disable network hotplugging
-		local f="/run/udev/rules.d/90-network.rules"
+		local d="/run/udev/rules.d"
+		mkdir -p "${d}"
+		local f="${d}/90-network.rules"
 		echo "# This file disables network hotplug events calling" >> "${f}"
 		echo "# old-style openrc net scripts" >> "${f}"
 		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
@@ -186,7 +192,6 @@ display_hotplugged_services()
 
 start_post()
 {
-	disable_oldnet_hotplug
 	start_udevmonitor
 	populate_dev
 	stop_udevmonitor

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     9fead30b465f2f1042da3e643cd8ce9a8f928928
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 19:35:27 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 19:37:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=9fead30b

bump kernel version requirement

Modern udev requires at least kernel 2.6.39, so adjust the version in
this script.

https://bugs.gentoo.org/show_bug.cgi?id=454324

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 193adf7..ea41fee 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -12,7 +12,7 @@ udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
-kv_min="${kv_min:-2.6.34}"
+kv_min="${kv_min:-2.6.39}"
 
 depend()
 {

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     81ca5fe7db1a42ffe8a53629aaae81087325a37a
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  4 21:49:07 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb  4 21:49:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=81ca5fe7

init.d/udev: remove kernel version checks

Udev does not actively block people from attempting to run on older
versions of the kernel, so we shouldn't either.

X-Gentoo-Bug: 454324
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=454324

---
 init.d/udev |   46 ----------------------------------------------
 1 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index ea41fee..af0a40e 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -12,7 +12,6 @@ udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
 udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
 udev_settle_timeout="${udev_settle_timeout:-60}"
-kv_min="${kv_min:-2.6.39}"
 
 depend()
 {
@@ -26,50 +25,6 @@ depend()
 	keyword -vserver -lxc
 }
 
-KV_to_int()
-{
-	[ -z $1 ] && return 1
-
-	local x=${1%%[!0-9.]*} y= z=
-	local KV_MAJOR=${x%%.*}
-	y=${x#*.}
-	[ "$x" = "$y" ] && y=0.0
-	local KV_MINOR=${y%%.*}
-	z=${y#*.}
-	[ "$y" = "$z" ] && z=0
-	local KV_MICRO=${z%%.*}
-	local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	[ "${KV_int}" -lt 131584 ] && return 1
-	
-	echo "${KV_int}"
-}
-
-_RC_GET_KV_CACHE=""
-get_KV()
-{
-	if [ -z "${_RC_GET_KV_CACHE}" ] ; then
-		_RC_GET_KV_CACHE="$(uname -r)"
-	fi
-	echo "$(KV_to_int "${_RC_GET_KV_CACHE}")"
-	return $?
-}
-
-# FIXME
-# Instead of this script testing kernel version, udev itself should
-# Maybe something like udevd --test || exit $?
-check_kernel()
-{
-	if [ $(get_KV) -lt $(KV_to_int ${kv_min}) ]; then
-		eerror "Your kernel is too old to work with this version of udev."
-		eerror "Current udev only supports Linux kernel ${kv_min} and newer."
-		return 1
-	fi
-	return 0
-}
-
 disable_oldnet_hotplug()
 {
 	if is_service_enabled network; then
@@ -85,7 +40,6 @@ disable_oldnet_hotplug()
 
 start_pre()
 {
-	check_kernel || return 1
 	if [ -e /proc/sys/kernel/hotplug ]; then
 		echo "" >/proc/sys/kernel/hotplug
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     5dd65894052cd6f4d9aebd67c93e61c3259e7303
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 04:16:00 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 19:08:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=5dd65894

udev: skip "udevadm trigger" calls if coldplug sequence is not requested

Reported-by: matthew4196 <AT> gmail.com
X-Gentoo-Bug: 424189
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=424189

---
 init.d/udev |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index af0a40e..f2e1e48 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -100,23 +100,20 @@ start_udevmonitor()
 
 populate_dev()
 {
-	if get_bootparam "nocoldplug" ; then
-		rc_coldplug="NO"
-		ewarn "Skipping udev coldplug as requested in kernel cmdline"
+	get_bootparam "nocoldplug" && rc_coldplug="no"
+	if ! yesno $rc_coldplug; then
+		ewarn "Skipping udev coldplug sequence"
+		return 0
 	fi
 
 	ebegin "Populating /dev with existing devices through uevents"
-	if ! yesno "${rc_coldplug}"; then
-		# Do not run any init-scripts, Bug #206518
-		udevadm control --property=do_not_run_plug_service=1
-	fi
 	udevadm trigger --type=subsystems --action=add
 	udevadm trigger --type=devices --action=add
 	eend $?
+
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle --timeout=${udev_settle_timeout}
 	eend $?
-	udevadm control --property=do_not_run_plug_service=
 	return 0
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     5eed3ed861253fa652353aa99dafa889d9149577
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 16:32:14 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 16:37:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=5eed3ed8

udev: fix permissions and symlinks when rc_coldplug="no"

Modification by William Hubbs: I added an einfo to inform users that
symbolic links and permissions are being set.

X-Gentoo-Bug: 461838
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=461838

---
 init.d/udev |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index f2e1e48..f21361b 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -102,6 +102,8 @@ populate_dev()
 {
 	get_bootparam "nocoldplug" && rc_coldplug="no"
 	if ! yesno $rc_coldplug; then
+		einfo "Setting /dev permissions and symbolic links"
+		udevadm trigger --attr-match=dev --action=add
 		ewarn "Skipping udev coldplug sequence"
 		return 0
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     7642c09da2caac6a9f4b510158f8faefb02315a3
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 17:20:43 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 17:20:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=7642c09d

re-arrange variable settings

Move the settings for udevmonitor_pid and udevmonitor_log to global
scope since they are used in two functions.
Also, we do not need to set the rc_coldplug, udev_debug,
udev_monitor_keep_running and udev_settle_timeout to their default
values in global scope; we can just use the default values when we refer
to the variables.

---
 init.d/udev |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index f21361b..a2f0ec1 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -7,11 +7,9 @@ description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"
 
-rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
-udev_debug="${udev_debug:-no}"
 udev_monitor="${udev_monitor:-no}"
-udev_monitor_keep_running="${udev_monitor_keep_running:-no}"
-udev_settle_timeout="${udev_settle_timeout:-60}"
+udevmonitor_log=/run/udevmonitor.log
+udevmonitor_pid=/run/udevmonitor.pid
 
 depend()
 {
@@ -53,7 +51,7 @@ start_pre()
 		fi
 	fi
 
-	if yesno "${udev_debug}"; then
+	if yesno "${udev_debug:-NO}"; then
 		command_args="${command_args} --debug 2> /run/udevdebug.log"
 	fi
 
@@ -89,9 +87,6 @@ start_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0
 
-	udevmonitor_log=/run/udevmonitor.log
-	udevmonitor_pid=/run/udevmonitor.pid
-
 	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
 	start-stop-daemon --start --stdout "${udevmonitor_log}" \
 		--make-pidfile --pidfile "${udevmonitor_pid}" \
@@ -101,7 +96,7 @@ start_udevmonitor()
 populate_dev()
 {
 	get_bootparam "nocoldplug" && rc_coldplug="no"
-	if ! yesno $rc_coldplug; then
+	if ! yesno ${rc_coldplug:-${RC_COLDPLUG:-yes}}; then
 		einfo "Setting /dev permissions and symbolic links"
 		udevadm trigger --attr-match=dev --action=add
 		ewarn "Skipping udev coldplug sequence"
@@ -114,7 +109,7 @@ populate_dev()
 	eend $?
 
 	ebegin "Waiting for uevents to be processed"
-	udevadm settle --timeout=${udev_settle_timeout}
+	udevadm settle --timeout=${udev_settle_timeout:-60}
 	eend $?
 	return 0
 }
@@ -123,7 +118,7 @@ stop_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0
 
-	if yesno "${udev_monitor_keep_running}"; then
+	if yesno "${udev_monitor_keep_running:-no}"; then
 		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
 	else
 		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     74b88a1f6299309abac982af6976a042e13052e1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 15:58:05 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 15:58:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=74b88a1f

remove extra information about /dev/root

This is not really needed in the output of the init script since it is
covered in the conf.d file and helper script.

---
 init.d/udev |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 09b59e9..b0955a4 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -96,10 +96,6 @@ start_udevmonitor()
 populate_dev()
 {
 	if yesno ${rc_dev_root_symlink:-yes}; then
-		einfo "The following is a temporary fix because some software"
-		einfo "depends on the existence of /dev/root."
-		einfo "For more information, see the following bug:"
-		einfo "https://bugs.gentoo.org/show_bug.cgi?id=438380"
 		ebegin "Generating a rule to create /dev/root symlink"
 		/lib/udev/dev-root-link.sh
 		eend $?

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b92c709dd7f29cc1ff4a1129b95149912d30d55b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 16:05:37 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 16:05:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=b92c709d

small wording change in the message about the /dev/root symlink

---
 init.d/udev |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index b0955a4..8f07d8f 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -96,7 +96,7 @@ start_udevmonitor()
 populate_dev()
 {
 	if yesno ${rc_dev_root_symlink:-yes}; then
-		ebegin "Generating a rule to create /dev/root symlink"
+		ebegin "Generating a rule to create a /dev/root symlink"
 		/lib/udev/dev-root-link.sh
 		eend $?
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     09d05dc2dae6020e97c9d25a23bbf0a317d72751
Author:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 15:35:14 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 15:38:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=09d05dc2

Fix the path for udevadm

We should run /bin/udevadm directly instead of using a symbolic link.

X-Gentoo-Bug: 464190
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=464190

---
 init.d/udev |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 8f07d8f..0e6aee6 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -90,7 +90,7 @@ start_udevmonitor()
 	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
 	start-stop-daemon --start --stdout "${udevmonitor_log}" \
 		--make-pidfile --pidfile "${udevmonitor_pid}" \
-		--background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
+		--background --exec /bin/udevadm -- monitor ${udev_monitor_opts}
 }
 
 populate_dev()
@@ -128,7 +128,7 @@ stop_udevmonitor()
 		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
 	else
 		einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
-		start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
+		start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /bin/udevadm
 	fi
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     03764dc66785f29f9ee64e51be5b40131ec815fa
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 15:15:28 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 15:49:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=03764dc6

Add net devices when coldplugging is disabled

This allows the predictable interface names to work when coldplugging is
disabled.

X-Gentoo-Bug: 465248
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=465248

---
 init.d/udev |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 0e6aee6..0e9abfe 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -105,6 +105,7 @@ populate_dev()
 	if ! yesno ${rc_coldplug:-${RC_COLDPLUG:-yes}}; then
 		einfo "Setting /dev permissions and symbolic links"
 		udevadm trigger --attr-match=dev --action=add
+		udevadm trigger --subsystem-match=net --action=add
 		ewarn "Skipping udev coldplug sequence"
 		return 0
 	fi

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[Samuli Suominen]

commit:     f9880da6560c54bca050679b389b397c79174de7
Author:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 17:40:26 2014 +0000
Commit:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 17:40:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=f9880da6

This code is now inside net.sh since netifrc 0.2.2, see Gentoo bug 503530

---
 init.d/udev | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index c861338..41a6e64 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -23,19 +23,6 @@ depend()
 	keyword -vserver -lxc
 }
 
-disable_oldnet_hotplug()
-{
-	if is_service_enabled network; then
-		# disable network hotplugging
-		local d="/run/udev/rules.d"
-		mkdir -p "${d}"
-		local f="${d}/90-network.rules"
-		echo "# This file disables network hotplug events calling" >> "${f}"
-		echo "# old-style openrc net scripts" >> "${f}"
-		echo "# as we use /etc/init.d/network to set up our network" >> "${f}"
-	fi
-}
-
 start_pre()
 {
 	if [ -e /proc/sys/kernel/hotplug ]; then
@@ -66,23 +53,9 @@ start_pre()
 		return 1
 	fi
 
-	# Need to do this before starting udev so it will load the rules.
-	disable_oldnet_hotplug
-
 	return 0
 }
 
-is_service_enabled()
-{
-	local svc="$1"
-
-	[ ! -e "/etc/init.d/${svc}" ] && return 1
-
-	[ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0
-	[ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0
-	return 1
-}
-
 start_udevmonitor()
 {
 	yesno "${udev_monitor}" || return 0

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     557e26c3a9b422ee2b0f1a3117cedd0854b679cc
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug  8 15:57:49 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug  8 16:14:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=557e26c3

remove udev-mount service script

OpenRC 0.13 and newer will mount /dev correctly,. The tests to make sure
devtmpfs is in the kernel and /dev is a mounted devtmpfs have been moved
to start_pre in the udev service script.

---
 init.d/udev       | 36 ++++++++++++++++++-------
 init.d/udev-mount | 81 -------------------------------------------------------
 2 files changed, 27 insertions(+), 90 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 41a6e64..72b2be2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -13,10 +13,8 @@ udevmonitor_pid=/run/udevmonitor.pid
 
 depend()
 {
-	# we depend on udev-mount explicitly, not dev-mount generic as we don't
-	# want mdev as a dev-mount provider to come in.
 	provide dev
-	need sysfs udev-mount
+	need sysfs dev-mount
 	before checkfs fsck
 
 	# udev does not work inside vservers
@@ -25,8 +23,24 @@ depend()
 
 start_pre()
 {
-	if [ -e /proc/sys/kernel/hotplug ]; then
-		echo "" >/proc/sys/kernel/hotplug
+	# make sure devtmpfs is in the kernel
+	if ! grep -qs devtmpfs /proc/filesystems; then
+		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
+		eerror "for this version of udev to run successfully."
+		eerror "This requires immediate attention."
+		if ! mountinfo -q /dev; then
+			mount -n -t tmpfs dev /dev
+			busybox mdev -s
+			mkdir /dev/pts
+		fi
+		return 1
+	fi
+
+	# make sure /dev is a mounted devtmpfs
+	if ! mountinfo -q -f devtmpfs /dev; then
+		eerror "Udev requires /dev to be a mounted devtmpfs."
+		eerror "Please reconfigure your system."
+		return 1
 	fi
 
 	# load unix domain sockets if built as module, Bug #221253
@@ -38,10 +52,6 @@ start_pre()
 		fi
 	fi
 
-	if yesno "${udev_debug:-NO}"; then
-		command_args="${command_args} --debug 2> /run/udevdebug.log"
-	fi
-
 	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
 		if [ -x "$f" -a ! -L "$f" ]; then
@@ -53,6 +63,14 @@ start_pre()
 		return 1
 	fi
 
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+
+	if yesno "${udev_debug:-NO}"; then
+		command_args="${command_args} --debug 2> /run/udevdebug.log"
+	fi
+
 	return 0
 }
 

diff --git a/init.d/udev-mount b/init.d/udev-mount
deleted file mode 100644
index a868340..0000000
--- a/init.d/udev-mount
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="mount devtmpfs on /dev"
-
-depend()
-{
-	provide dev-mount
-	keyword -vserver -lxc
-}
-
-mount_dev_directory()
-{
-	local mounted=false fstab=false action=--mount msg=Mounting rc=0
-
-	if ! grep -qs devtmpfs /proc/filesystems; then
-		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
-		eerror "for this version of udev to run successfully."
-		eerror "This requires immediate attention."
-		if ! mountinfo -q /dev; then
-			mount -n -t tmpfs dev /dev
-			busybox mdev -s
-			mkdir /dev/pts
-		fi
-		return 1
-	fi
-
-	# Is /dev already a mounted devtmpfs?
-	mountinfo -q -f devtmpfs /dev && mounted=true
-
-	# If an entry for /dev exists in fstab it must be a devtmpfs.
-	fstabinfo -q -t devtmpfs /dev && fstab=true
-
-	# No options are processed here as they should all be in /etc/fstab
-	if $fstab; then
-		$mounted && action=--remount && msg=Remounting
-		ebegin "$msg /dev according to /etc/fstab"
-		fstabinfo $action /dev
-		rc=$?
-	elif ! $mounted; then
-		ebegin "Mounting /dev"
-		# Some devices require exec, Bug #92921
-		mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
-		rc=$?
-	else
-		ebegin "Using /dev mounted from kernel"
-	fi
-
-	eend $rc
-}
-
-seed_dev()
-{
-	# Seed /dev with some things that we know we need
-
-	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-	# to $CONSOLE with/without bootsplash before udevd creates it
-	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-	# 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 -m 666 /dev/null c 1 3
-
-	# so udev can add its start-message to dmesg
-	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-	# Create problematic directories
-	mkdir -p /dev/pts /dev/shm
-	return 0
-}
-
-start()
-{
-	mount_dev_directory || return 1
-
-	seed_dev
-	return 0
-}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     557e26c3a9b422ee2b0f1a3117cedd0854b679cc
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug  8 15:57:49 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug  8 16:14:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=557e26c3

remove udev-mount service script

OpenRC 0.13 and newer will mount /dev correctly,. The tests to make sure
devtmpfs is in the kernel and /dev is a mounted devtmpfs have been moved
to start_pre in the udev service script.

---
 init.d/udev       | 36 ++++++++++++++++++-------
 init.d/udev-mount | 81 -------------------------------------------------------
 2 files changed, 27 insertions(+), 90 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 41a6e64..72b2be2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -13,10 +13,8 @@ udevmonitor_pid=/run/udevmonitor.pid
 
 depend()
 {
-	# we depend on udev-mount explicitly, not dev-mount generic as we don't
-	# want mdev as a dev-mount provider to come in.
 	provide dev
-	need sysfs udev-mount
+	need sysfs dev-mount
 	before checkfs fsck
 
 	# udev does not work inside vservers
@@ -25,8 +23,24 @@ depend()
 
 start_pre()
 {
-	if [ -e /proc/sys/kernel/hotplug ]; then
-		echo "" >/proc/sys/kernel/hotplug
+	# make sure devtmpfs is in the kernel
+	if ! grep -qs devtmpfs /proc/filesystems; then
+		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
+		eerror "for this version of udev to run successfully."
+		eerror "This requires immediate attention."
+		if ! mountinfo -q /dev; then
+			mount -n -t tmpfs dev /dev
+			busybox mdev -s
+			mkdir /dev/pts
+		fi
+		return 1
+	fi
+
+	# make sure /dev is a mounted devtmpfs
+	if ! mountinfo -q -f devtmpfs /dev; then
+		eerror "Udev requires /dev to be a mounted devtmpfs."
+		eerror "Please reconfigure your system."
+		return 1
 	fi
 
 	# load unix domain sockets if built as module, Bug #221253
@@ -38,10 +52,6 @@ start_pre()
 		fi
 	fi
 
-	if yesno "${udev_debug:-NO}"; then
-		command_args="${command_args} --debug 2> /run/udevdebug.log"
-	fi
-
 	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
 		if [ -x "$f" -a ! -L "$f" ]; then
@@ -53,6 +63,14 @@ start_pre()
 		return 1
 	fi
 
+	if [ -e /proc/sys/kernel/hotplug ]; then
+		echo "" >/proc/sys/kernel/hotplug
+	fi
+
+	if yesno "${udev_debug:-NO}"; then
+		command_args="${command_args} --debug 2> /run/udevdebug.log"
+	fi
+
 	return 0
 }
 

diff --git a/init.d/udev-mount b/init.d/udev-mount
deleted file mode 100644
index a868340..0000000
--- a/init.d/udev-mount
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="mount devtmpfs on /dev"
-
-depend()
-{
-	provide dev-mount
-	keyword -vserver -lxc
-}
-
-mount_dev_directory()
-{
-	local mounted=false fstab=false action=--mount msg=Mounting rc=0
-
-	if ! grep -qs devtmpfs /proc/filesystems; then
-		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
-		eerror "for this version of udev to run successfully."
-		eerror "This requires immediate attention."
-		if ! mountinfo -q /dev; then
-			mount -n -t tmpfs dev /dev
-			busybox mdev -s
-			mkdir /dev/pts
-		fi
-		return 1
-	fi
-
-	# Is /dev already a mounted devtmpfs?
-	mountinfo -q -f devtmpfs /dev && mounted=true
-
-	# If an entry for /dev exists in fstab it must be a devtmpfs.
-	fstabinfo -q -t devtmpfs /dev && fstab=true
-
-	# No options are processed here as they should all be in /etc/fstab
-	if $fstab; then
-		$mounted && action=--remount && msg=Remounting
-		ebegin "$msg /dev according to /etc/fstab"
-		fstabinfo $action /dev
-		rc=$?
-	elif ! $mounted; then
-		ebegin "Mounting /dev"
-		# Some devices require exec, Bug #92921
-		mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev
-		rc=$?
-	else
-		ebegin "Using /dev mounted from kernel"
-	fi
-
-	eend $rc
-}
-
-seed_dev()
-{
-	# Seed /dev with some things that we know we need
-
-	# creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-	# to $CONSOLE with/without bootsplash before udevd creates it
-	[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-	[ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-	[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-	# 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 -m 666 /dev/null c 1 3
-
-	# so udev can add its start-message to dmesg
-	[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-	# Create problematic directories
-	mkdir -p /dev/pts /dev/shm
-	return 0
-}
-
-start()
-{
-	mount_dev_directory || return 1
-
-	seed_dev
-	return 0
-}

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     7da8580803a5d44247d117c98e5df52761ae0c0d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Nov  3 18:49:49 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 20:37:00 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=7da85808

move default for udev_monitor to the yesno calls

---
 init.d/udev | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 72b2be2..654eee3 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -7,7 +7,6 @@ description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"
 
-udev_monitor="${udev_monitor:-no}"
 udevmonitor_log=/run/udevmonitor.log
 udevmonitor_pid=/run/udevmonitor.pid
 
@@ -76,7 +75,7 @@ start_pre()
 
 start_udevmonitor()
 {
-	yesno "${udev_monitor}" || return 0
+	yesno "${udev_monitor:-no}" || return 0
 
 	einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
 	start-stop-daemon --start --stdout "${udevmonitor_log}" \
@@ -131,7 +130,7 @@ populate_dev()
 
 stop_udevmonitor()
 {
-	yesno "${udev_monitor}" || return 0
+	yesno "${udev_monitor:-no}" || return 0
 
 	if yesno "${udev_monitor_keep_running:-no}"; then
 		ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     4a106494f2d0c42ca191412ad5903e728334c5c1
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Dec  4 00:53:47 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Dec  4 00:53:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=4a106494

add provide for dev-settle

---
 init.d/udev-settle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index dd3fe4b..f5253f5 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -6,6 +6,7 @@ depend()
 {
 need udev
 after udev-trigger
+provide dev-settle
 	keyword -vserver -lxc
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b073ac774d069518ad79129d3baa6f5564f16304
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Apr 29 15:53:39 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 20:31:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=b073ac77

Make start-stop-daemon daemonize instead of udev

This is needed since udev does not close std{in,out,err} if the --daemon
function is used, which leaves the terminal open forever.

X-Gentoo-Bug: 547196
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=547196

 init.d/udev | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index 57fae76..e2ff830 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command_args="--daemon ${udev_opts}"
+command_args="${udev_opts}"
+start_stop_daemon_args="--background"
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     da8cd390676a8bfb797ec399a2e9d2da7396f2c5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Apr 29 15:53:39 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 02:06:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=da8cd390

Make start-stop-daemon daemonize instead of udev

This is needed since udev does not close std{in,out,err} if the --daemon
function is used, which leaves the terminal open forever.

X-Gentoo-Bug: 547916
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=547916

 init.d/udev | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index 57fae76..e2ff830 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command_args="--daemon ${udev_opts}"
+command_args="${udev_opts}"
+start_stop_daemon_args="--background"
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     c959797a80f83ec59b0ceee4732825767a01c429
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat May  2 19:44:32 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat May  2 19:44:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=c959797a

Disable the scripts in a systemd-nspawn container

X-Gentoo-Bug: 548090
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548090

 init.d/udev         | 4 +---
 init.d/udev-settle  | 2 +-
 init.d/udev-trigger | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index e2ff830..f26caa4 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -12,9 +12,7 @@ depend()
 {
 	need sysfs dev-mount
 	before checkfs fsck
-
-	# udev does not work inside vservers
-	keyword -vserver -lxc
+	keyword -lxc -systemd-nspawn -vserver
 }
 
 start_pre()

diff --git a/init.d/udev-settle b/init.d/udev-settle
index f5253f5..4c640db 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -7,7 +7,7 @@ depend()
 need udev
 after udev-trigger
 provide dev-settle
-	keyword -vserver -lxc
+	keyword -lxc -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index abc4540..d3f40e6 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -11,7 +11,7 @@ depend()
 {
 	need udev
 	provide dev
-	keyword -vserver -lxc
+	keyword -lxc -systemd-nspawn -vserver
 }
 
 start_pre()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     cf7ac2fb255ff122d9e57b5b145e71bb2e021c4b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jun  1 15:31:31 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 15:31:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=cf7ac2fb

udev-settle: always return success

This is how earlier versions of the scripts behave, so we should not
break expectations.

 init.d/udev-settle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index 4c640db..cc87a39 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -15,4 +15,5 @@ start()
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle --timeout=${udev_settle_timeout:-60}
 	eend $?
+	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     84aa1a5d5896e5883c7c3adb023f2b9d30537775
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jun  1 15:32:25 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 15:32:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=84aa1a5d

udev-trigger: always return success

This is how earlier versions of the scripts behaved, so we should not
break expectations.

 init.d/udev-trigger | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index d3f40e6..b67d597 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -88,4 +88,5 @@ start()
 	udevadm trigger --type=subsystems --action=add
 	udevadm trigger --type=devices --action=add
 	eend $?
+	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     ba6eb291508d031819290e4191a883f50b24d572
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jun 10 21:15:01 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 21:17:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=ba6eb291

udev-trigger: Fix typos and make all functions return success

X-Gentoo-Bug: 551644
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=551644

 init.d/udev-trigger | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index b67d597..a04f9e7 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -22,6 +22,7 @@ start_pre()
 			--make-pidfile --pidfile "${udevmonitor_pid}" \
 			--background --exec /bin/udevadm -- monitor ${udev_monitor_opts}
 	fi
+	return 0
 }
 
 display_hotplugged_services()
@@ -34,11 +35,12 @@ display_hotplugged_services()
 		services="${services} ${svc}"
 	done
 	[ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
+	return 0
 }
 
 start_post()
 {
-	if yesno "${udev_monitor}:-no}"; then
+	if yesno "${udev_monitor:-no}"; then
 		if yesno "${udev_monitor_keep_running:-no}"; then
 			ewarn "udevmonitor is still writing into ${udevmonitor_log}"
 		else
@@ -48,6 +50,7 @@ start_post()
 		fi
 		fi
 		display_hotplugged_services
+		return 0
 }
 
 # This is here because some software expects /dev/root to exist.
@@ -65,6 +68,7 @@ dev_root_link()
 	[ "$ROOT_MAJOR" != 0 ] || return 0
 
 	echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$ROOT_MAJOR'", ENV{MINOR}=="'$ROOT_MINOR'", SYMLINK+="root"' > $RULESDIR/61-dev-root-link.rules
+	return 0
 }
 
 start()

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b34b2d9fcc5b39e202363d874fb3a3ead6526b0d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 22:48:43 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 02:44:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=b34b2d9f

udev: Start in daemon mode with stdin/stdout/stderr = /dev/null

Starting in daemon mode prevents udev-trigger from running before
udevd has fully started. See bug 551928.

To prevent a regression on bug 547916, we use shell redirection
to redirect the standard file descriptors to /dev/null.

X-Gentoo-Bug: 551724
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=551724

 init.d/udev | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index f26caa4..4b1147f 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,8 +2,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command_args="${udev_opts}"
-start_stop_daemon_args="--background"
+command_args="--daemon ${udev_opts}"
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"
@@ -61,10 +60,15 @@ start_pre()
 		echo "" >/proc/sys/kernel/hotplug
 	fi
 
+	local stderr=/dev/null
+
 	if yesno "${udev_debug:-NO}"; then
-		command_args="${command_args} --debug 2> /run/udevdebug.log"
+		command_args="${command_args} --debug"
+		stderr=/run/udevdebug.log
 	fi
 
+	command_args="${command_args} < /dev/null > /dev/null 2> ${stderr}"
+
 	return 0
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     03c02c050df2ae3d91ec6428f024d7d4042ef077
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 20:36:49 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 21:42:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=03c02c05

udev: Remove workaround for redirecting stdio to /dev/null

systemd-udevd was fixed upstream, making this hack unnecessary.

 init.d/udev | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 4b1147f..f286ad8 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -60,15 +60,10 @@ start_pre()
 		echo "" >/proc/sys/kernel/hotplug
 	fi
 
-	local stderr=/dev/null
-
 	if yesno "${udev_debug:-NO}"; then
-		command_args="${command_args} --debug"
-		stderr=/run/udevdebug.log
+		command_args="${command_args} --debug 2> /run/udevdebug.log"
 	fi
 
-	command_args="${command_args} < /dev/null > /dev/null 2> ${stderr}"
-
 	return 0
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     ee95471d2c09f373b0b0683e40cd0e1f1a4904ac
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 15:57:55 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 15:57:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=ee95471d

udev: create a function to locate the binary

 init.d/udev | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index f286ad8..8106a20 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -14,6 +14,19 @@ depend()
 	keyword -lxc -systemd-nspawn -vserver
 }
 
+get_udevd_binary() {
+	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
+	for f in ${bins}; do
+		if [ -x "$f" -a ! -L "$f" ]; then
+			command="$f"
+		fi
+	done
+	if [ -z "$command" ]; then
+		eerror "Unable to find udev executable."
+		return 1
+	fi
+}
+
 start_pre()
 {
 	# make sure devtmpfs is in the kernel
@@ -45,16 +58,7 @@ start_pre()
 		fi
 	fi
 
-	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
-	for f in ${bins}; do
-		if [ -x "$f" -a ! -L "$f" ]; then
-			command="$f"
-		fi
-	done
-	if [ -z "$command" ]; then
-		eerror "Unable to find udev executable."
-		return 1
-	fi
+	get_udevd_binary || return 1
 
 	if [ -e /proc/sys/kernel/hotplug ]; then
 		echo "" >/proc/sys/kernel/hotplug
@@ -75,8 +79,9 @@ stop()
 	rc=$?
 	if [ $rc -ne 0 ]; then
 		eend $rc "Failed to stop $RC_SVCNAME using udevadm"
+		get_udevd_binary || return 1
 		ebegin "Trying with start-stop-daemon"
-		start-stop-daemon --stop --exec /sbin/udevd
+		start-stop-daemon --stop --exec ${command}
 		rc=$?
 	fi
 	eend $rc "Failed to stop $RC_SVCNAME"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     823bd46baa0838bedca15b1921d76ca74082db7d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 17:13:27 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 17:13:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=823bd46b

fix indentation

 init.d/udev-trigger | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index a04f9e7..0f69455 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -48,9 +48,9 @@ start_post()
 			start-stop-daemon --stop --pidfile "${udevmonitor_pid}" \
 				--exec /bin/udevadm
 		fi
-		fi
-		display_hotplugged_services
-		return 0
+	fi
+	display_hotplugged_services
+	return 0
 }
 
 # This is here because some software expects /dev/root to exist.

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     e59c9f640ac0e4021e0d31a8d2f647e5bd313939
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Sep 10 16:03:38 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 16:03:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=e59c9f64

udev: make bins variable local

 init.d/udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index 8106a20..458a737 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -15,7 +15,7 @@ depend()
 }
 
 get_udevd_binary() {
-	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
+	local bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
 		if [ -x "$f" -a ! -L "$f" ]; then
 			command="$f"

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     98e65b8774bfc30e30785e4cb24c9b5daba423a0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu May 26 15:55:57 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 26 15:55:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=98e65b87

fix shebang line in udev service script

 init.d/udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index 458a737..6ff21b2 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     b14b8a67dce59c950f6f515aa1b537f742957120
Author:     William Hubbs <whubbs <AT> gaikai <DOT> com>
AuthorDate: Tue May 31 21:12:19 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May 31 21:12:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=b14b8a67

udev-settle: fix indentation

 init.d/udev-settle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index cc87a39..e439a1d 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -4,9 +4,9 @@
 
 depend()
 {
-need udev
-after udev-trigger
-provide dev-settle
+	need udev
+	after udev-trigger
+	provide dev-settle
 	keyword -lxc -systemd-nspawn -vserver
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     e785e907373017c01048d5edef05594c0f072390
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue May 31 21:12:19 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 21:17:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=e785e907

udev-settle: fix indentation

 init.d/udev-settle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index cc87a39..e439a1d 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -4,9 +4,9 @@
 
 depend()
 {
-need udev
-after udev-trigger
-provide dev-settle
+	need udev
+	after udev-trigger
+	provide dev-settle
 	keyword -lxc -systemd-nspawn -vserver
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     0cc7d1bac0426a0ac5e03fbab66b9256e6bd3787
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Nov  9 20:31:20 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 20:31:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=0cc7d1ba

init.d/udev-settle: allow service to fail if udevadm fails

 init.d/udev-settle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index e439a1d..93907f6 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -15,5 +15,4 @@ start()
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle --timeout=${udev_settle_timeout:-60}
 	eend $?
-	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     c292c648516682bc3456c66f6e6dbb9ff4ba52c5
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 10 16:39:29 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 16:39:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=c292c648

init.d/udev-settle: typo fix

 init.d/udev-settle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index 1a73105..c495769 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -14,6 +14,6 @@ start()
 {
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle \
-		${udev_settle_timeout:+--timeout}=$udev_settle_timeout
+		${udev_settle_timeout:+--timeout=}$udev_settle_timeout
 	eend $?
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     413b37eb25f384129326b033de369be4b725c7e0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 10 17:14:39 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 17:14:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=413b37eb

udev-trigger: allow failure if udevadm exits with non-zero status

 init.d/udev-trigger | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index 0f69455..bdd4884 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -84,13 +84,13 @@ start()
 		einfo "Setting /dev permissions and symbolic links"
 		udevadm trigger --attr-match=dev --action=add
 		udevadm trigger --subsystem-match=net --action=add
+		rc=$?
 		ewarn "Skipping udev coldplug sequence"
-		return 0
+		return $rc
 	fi
 
 	ebegin "Populating /dev with existing devices through uevents"
 	udevadm trigger --type=subsystems --action=add
 	udevadm trigger --type=devices --action=add
 	eend $?
-	return 0
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     6f98cf89f54a9ad1c9625577d100f6ca8b8a2b0b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 20 16:53:59 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 20 17:07:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=6f98cf89

Do not use the --daemon option in the udev service script

Using this option does not allow OpenRC to show the status correctly
since udevd doesn't write a pid file.
We need to create the pidfile ourselves.

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 6ff21b2..d0f9d61 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command_args="--daemon ${udev_opts}"
+command_args="${udev_opts}"
+command_background=yes
+pidfile=/run/udev.pid
 description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"
@@ -79,11 +81,11 @@ stop()
 	rc=$?
 	if [ $rc -ne 0 ]; then
 		eend $rc "Failed to stop $RC_SVCNAME using udevadm"
-		get_udevd_binary || return 1
 		ebegin "Trying with start-stop-daemon"
-		start-stop-daemon --stop --exec ${command}
+		start-stop-daemon --stop --pidfile "${pidfile}"
 		rc=$?
 	fi
+	[ $rc -eq 0 ] && rm -f "${pidfile}"
 	eend $rc "Failed to stop $RC_SVCNAME"
 }
 

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     efdd416d20966196cf0ac8dd3231c5919b984ae8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 20:07:34 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 20:07:44 2019 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=efdd416d

init.d: style fixes

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev         | 20 +++++++++-----------
 init.d/udev-settle  |  8 +++-----
 init.d/udev-trigger | 23 +++++++++--------------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index d0f9d61..6aea5a5 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -9,17 +9,17 @@ description="udev manages device permissions and symbolic links in /dev"
 extra_started_commands="reload"
 description_reload="Reload the udev rules and databases"
 
-depend()
-{
+depend() {
 	need sysfs dev-mount
 	before checkfs fsck
 	keyword -lxc -systemd-nspawn -vserver
 }
 
 get_udevd_binary() {
-	local bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
+	local bins
+	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
-		if [ -x "$f" -a ! -L "$f" ]; then
+		if [ -x "$f" ] && [ ! -L "$f" ]; then
 			command="$f"
 		fi
 	done
@@ -29,8 +29,7 @@ get_udevd_binary() {
 	fi
 }
 
-start_pre()
-{
+start_pre() {
 	# make sure devtmpfs is in the kernel
 	if ! grep -qs devtmpfs /proc/filesystems; then
 		eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration"
@@ -73,9 +72,9 @@ start_pre()
 	return 0
 }
 
-stop()
-{
-	local rc=0
+stop() {
+	local rc
+	rc=0
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	udevadm control --exit
 	rc=$?
@@ -89,8 +88,7 @@ stop()
 	eend $rc "Failed to stop $RC_SVCNAME"
 }
 
-reload()
-{
+reload() {
 	ebegin "reloading udev rules and databases"
 	udevadm control --reload
 	eend $?

diff --git a/init.d/udev-settle b/init.d/udev-settle
index c495769..f6e0707 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -2,18 +2,16 @@
 # Copyright 2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-depend()
-{
+depend() {
 	need udev
 	after udev-trigger
 	provide dev-settle
 	keyword -lxc -systemd-nspawn -vserver
 }
 
-start()
-{
+start() {
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle \
-		${udev_settle_timeout:+--timeout=}$udev_settle_timeout
+		${udev_settle_timeout:+--timeout=}"${udev_settle_timeout}"
 	eend $?
 }

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index bdd4884..dfca873 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -7,15 +7,13 @@ description="udev Coldplug all Devices"
 udevmonitor_log=/run/udevmonitor.log
 udevmonitor_pid=/run/udevmonitor.pid
 
-depend()
-{
+depend() {
 	need udev
 	provide dev
 	keyword -lxc -systemd-nspawn -vserver
 }
 
-start_pre()
-{
+start_pre() {
 	if yesno "${udev_monitor:-no}"; then
 		einfo "Running udevadm monitor ${udev_monitor_opts} to log all events"
 		start-stop-daemon --start --stdout "${udevmonitor_log}" \
@@ -25,9 +23,8 @@ start_pre()
 	return 0
 }
 
-display_hotplugged_services()
-{
-	local svcfile= svc= services=
+display_hotplugged_services() {
+	local svcfile svc services
 	for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
 		svc="${svcfile##*/}"
 		[ -x "${svcfile}" ] || continue
@@ -38,8 +35,7 @@ display_hotplugged_services()
 	return 0
 }
 
-start_post()
-{
+start_post() {
 	if yesno "${udev_monitor:-no}"; then
 		if yesno "${udev_monitor_keep_running:-no}"; then
 			ewarn "udevmonitor is still writing into ${udevmonitor_log}"
@@ -56,9 +52,9 @@ start_post()
 # This is here because some software expects /dev/root to exist.
 # For more information, see this bug:
 # https://bugs.gentoo.org/show_bug.cgi?id=438380
-dev_root_link()
-{
-	local RULESDIR=/run/udev/rules.d
+dev_root_link() {
+	local RULESDIR
+	RULESDIR=/run/udev/rules.d
 	[ -d $RULESDIR ] || mkdir -p $RULESDIR
 	eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/ ||
 		true)
@@ -71,8 +67,7 @@ dev_root_link()
 	return 0
 }
 
-start()
-{
+start() {
 	if yesno ${rc_dev_root_symlink:-yes}; then
 		ebegin "Generating a rule to create a /dev/root symlink"
 		dev_root_link

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     ddf1a5a7733b3b4fc5df0fa6f5de70164f080575
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 20:58:52 2019 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 21:26:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=ddf1a5a7

init.d/udev: remove the RC variable from the stop function

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 6aea5a5..4e618ca 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -73,19 +73,12 @@ start_pre() {
 }
 
 stop() {
-	local rc
-	rc=0
+	get_udevd_binary || return 1
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	udevadm control --exit
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eend $rc "Failed to stop $RC_SVCNAME using udevadm"
-		ebegin "Trying with start-stop-daemon"
-		start-stop-daemon --stop --pidfile "${pidfile}"
-		rc=$?
-	fi
-	[ $rc -eq 0 ] && rm -f "${pidfile}"
-	eend $rc "Failed to stop $RC_SVCNAME"
+	udevadm control --exit ||
+		start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}" &&
+		rm -f "${pidfile}"
+	eend $? "Failed to stop $RC_SVCNAME"
 }
 
 reload() {

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     99de14a98649cf119ce220dd1c9fba58b98cb3b2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 19:31:16 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 16:12:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=99de14a9

Allow udevd to be a symlink

As of systemd-246, systemd-udevd is a symlink to udevadm.

Bug: https://bugs.gentoo.org/734950
Reverts: b165050513894b3d600e8302bd68c7ba553fbb04
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index 4e618ca..6446344 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -19,7 +19,7 @@ get_udevd_binary() {
 	local bins
 	bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd"
 	for f in ${bins}; do
-		if [ -x "$f" ] && [ ! -L "$f" ]; then
+		if [ -x "$f" ]; then
 			command="$f"
 		fi
 	done

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     e1c5bed2a1581db97f3912eba2ae98a1122388df
Author:     Kaarle Ritvanen <kaarle.ritvanen <AT> datakunkku <DOT> fi>
AuthorDate: Sat Apr 11 18:08:42 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 16:13:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=e1c5bed2

udev-settle: fix timeout argument quoting

empty value resulted in "Extraneous argument" error

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev-settle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/udev-settle b/init.d/udev-settle
index f6e0707..a5ceb93 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -12,6 +12,6 @@ depend() {
 start() {
 	ebegin "Waiting for uevents to be processed"
 	udevadm settle \
-		${udev_settle_timeout:+--timeout=}"${udev_settle_timeout}"
+		${udev_settle_timeout:+--timeout="${udev_settle_timeout}"}
 	eend $?
 }

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     5f1ce4853b7f14883478608d8af1ce651aa076df
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 18:48:27 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat May 22 18:48:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=5f1ce485

use -containers keyword to cover all containers

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev         | 2 +-
 init.d/udev-settle  | 2 +-
 init.d/udev-trigger | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 6446344..c7b8ade 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -12,7 +12,7 @@ description_reload="Reload the udev rules and databases"
 depend() {
 	need sysfs dev-mount
 	before checkfs fsck
-	keyword -lxc -systemd-nspawn -vserver
+	keyword -containers
 }
 
 get_udevd_binary() {

diff --git a/init.d/udev-settle b/init.d/udev-settle
index a5ceb93..9d661a4 100644
--- a/init.d/udev-settle
+++ b/init.d/udev-settle
@@ -6,7 +6,7 @@ depend() {
 	need udev
 	after udev-trigger
 	provide dev-settle
-	keyword -lxc -systemd-nspawn -vserver
+	keyword -containers
 }
 
 start() {

diff --git a/init.d/udev-trigger b/init.d/udev-trigger
index dfca873..9a0c7cc 100644
--- a/init.d/udev-trigger
+++ b/init.d/udev-trigger
@@ -10,7 +10,7 @@ udevmonitor_pid=/run/udevmonitor.pid
 depend() {
 	need udev
 	provide dev
-	keyword -lxc -systemd-nspawn -vserver
+	keyword -containers
 }
 
 start_pre() {

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     9ce321d30bed9f952018f5bb63b3c8a3aebcd4ba
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 22:51:21 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May 24 22:51:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=9ce321d3

fix --debug option

Thanks to nissarin <AT> gmail.com for the patch

Closes: https://bugs.gentoo.org/751973
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/udev b/init.d/udev
index c7b8ade..705d87c 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -66,7 +66,8 @@ start_pre() {
 	fi
 
 	if yesno "${udev_debug:-NO}"; then
-		command_args="${command_args} --debug 2> /run/udevdebug.log"
+		command_args="${command_args} --debug"
+		error_log="/run/udevdebug.log"
 	fi
 
 	return 0

[gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/

[William Hubbs]

commit:     93777e58b134935a485214e4f13dce2f2cebb800
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 16:41:40 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 18:38:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/commit/?id=93777e58

udev: unlink control socket after stopping udevd

Closes: https://bugs.gentoo.org/810928
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 init.d/udev | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/udev b/init.d/udev
index 705d87c..724cb82 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -77,9 +77,9 @@ stop() {
 	get_udevd_binary || return 1
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
 	udevadm control --exit ||
-		start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}" &&
-		rm -f "${pidfile}"
+		start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}"
 	eend $? "Failed to stop $RC_SVCNAME"
+	[ $? -eq 0 ] && rm -f "${pidfile}" /run/udev/control
 }
 
 reload() {