From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QhnuD-0000v5-7s for garchives@archives.gentoo.org; Fri, 15 Jul 2011 19:18:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F94C21C030; Fri, 15 Jul 2011 19:18:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D294A21C030 for ; Fri, 15 Jul 2011 19:18:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32EFB2AC301 for ; Fri, 15 Jul 2011 19:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4276F8003D for ; Fri, 15 Jul 2011 19:18:22 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <6083bcc3561ff50c58fe45b218649586c3b9f814.WilliamH@gentoo> Subject: [gentoo-commits] proj/udev-gentoo-scripts:master commit in: init.d/ X-VCS-Repository: proj/udev-gentoo-scripts X-VCS-Files: init.d/udev init.d/udev-mount X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 6083bcc3561ff50c58fe45b218649586c3b9f814 Date: Fri, 15 Jul 2011 19:18:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7d076ede1cc1a35c64a61a3340412c7d commit: 6083bcc3561ff50c58fe45b218649586c3b9f814 Author: William Hubbs gentoo org> AuthorDate: Fri Jul 15 19:17:14 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Jul 15 19:17:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/udev-gentoo-s= cripts.git;a=3Dcommit;h=3D6083bcc3 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=3D"Run udevd and create the device-nodes" =20 [ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf =20 +persistent_cd_disable=3D"${persistent_cd_disable:-no}" +persistent_net_disable=3D"${persistent_net_disable:-no}" rc_coldplug=3D${rc_coldplug:-${RC_COLDPLUG:-YES}} +udev_debug=3D"${udev_debug:-no}" +udev_monitor=3D"${udev_monitor:-no}" +udev_monitor_keep_running=3D"${udev_monitor_keep_running:-no}" +udev_settle_timeout=3D"${udev_settle_timeout:-60}" =20 depend() { @@ -90,7 +96,7 @@ start_udevd() local opts=3D"${udev_opts}" =20 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=3D${udev_settle_timeout:-60} + udevadm settle --timeout=3D${udev_settle_timeout} eend $? =20 udevadm control --property=3Ddo_not_run_plug_service=3D @@ -137,7 +143,7 @@ populate_dev() # for debugging start_udevmonitor() { - yesno "${udev_monitor:-no}" || return 0 + yesno "${udev_monitor}" || return 0 =20 udevmonitor_log=3D/dev/.udev/udevmonitor.log udevmonitor_pid=3D/dev/.udev/udevmonitor.pid @@ -150,9 +156,9 @@ start_udevmonitor() =20 stop_udevmonitor() { - yesno "${udev_monitor:-no}" || return 0 + yesno "${udev_monitor}" || return 0 =20 - if yesno "${udev_monitor_keep_running:-no}"; then + if yesno "${udev_monitor_keep_running}"; then ewarn "udev: udevmonitor is still running and writing into ${udevmonit= or_log}" else einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" @@ -246,8 +252,8 @@ _start() fi =20 root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_ne= t_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disa= ble:-no} + rules_disable_switch 75-persistent-net-generator.rules "${persistent_ne= t_disable}" + rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disa= ble} =09 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 @@ =20 description=3D"Mount tmpfs on /dev" [ -e /etc/conf.d/udev ] && . /etc/conf.d/udev +unreliable_kernel_warning=3D"${unreliable_kernel_warning:-yes}" =20 # get_KV and KV_to_int . /lib/udev/shell-compat-KV.sh @@ -19,7 +20,7 @@ check_kernel() return 1 fi =20 - yesno "${unreliable_kernel_warning:-yes}" || return 0 + yesno "${unreliable_kernel_warning}" || return 0 =20 if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable o= peration of udev."