From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E2EE9198005 for ; Tue, 19 Mar 2013 17:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBCFAE05BE; Tue, 19 Mar 2013 17:24:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49082E05BE for ; Tue, 19 Mar 2013 17:24:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F9A133DB7A for ; Tue, 19 Mar 2013 17:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AF928E4073 for ; Tue, 19 Mar 2013 17:24:34 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1363713643.7642c09da2caac6a9f4b510158f8faefb02315a3.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 X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 7642c09da2caac6a9f4b510158f8faefb02315a3 X-VCS-Branch: master Date: Tue, 19 Mar 2013 17:24:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7a29230e-4f44-44f3-a89b-914231203781 X-Archives-Hash: 91578a8c316e2685756597b1f0c6a4f6 commit: 7642c09da2caac6a9f4b510158f8faefb02315a3 Author: William Hubbs gentoo org> AuthorDate: Tue Mar 19 17:20:43 2013 +0000 Commit: William Hubbs gentoo 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}"