Attachment 305130 Details for Bug 442341 – lirc-more-args-2.patch

[patch] lirc-more-args-2.patch

lirc-more-args-2.patch (text/plain), 2.67 KB, created by Bastien Nocera on 2008-05-12 13:58:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2008-05-12 13:58:39 UTC

Size: 2.67 KB

patch

obsolete

>Index: lirc.init
>===================================================================
>RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.init,v
>retrieving revision 1.3
>diff -u -p -u -p -r1.3 lirc.init
>--- lirc.init	16 Aug 2007 09:16:35 -0000	1.3
>+++ lirc.init	12 May 2008 13:57:43 -0000
>@@ -30,9 +30,39 @@ prog2=$(basename $exec2)
> 
> lockfile=/var/lock/subsys/lirc
> 
>+build_remote_args ()
>+{
>+	local REMOTE_ARGS="$*"
>+
>+	#For remote only detection support, we need
>+	#REMOTE_DEVICE undefined
>+	if [ -z "$REMOTE_DEVICE" ] ; then
>+		for dev in /dev/lirc0; do
>+			if [ -c $dev ]; then
>+				REMOTE_DEVICE="$dev"
>+				break
>+			fi
>+		done
>+	fi
>+
>+	#If we have a REMOTE_DEVICE or REMOTE_DRIVER defined (either because no devices
>+	#were defined, OR if we explicitly did), then populate REMOTE_ARGS
>+	if [ ! -z "$REMOTE_DEVICE" ] || [ ! -z "$REMOTE_DRIVER" ]; then
>+		if [ -n "$REMOTE_DEVICE" ] && [ "$REMOTE_DEVICE" != "none" ]; then
>+			REMOTE_ARGS="--device=$REMOTE_DEVICE $REMOTE_ARGS"
>+		fi
>+		if [ -n "$REMOTE_DRIVER" ] && [ "$REMOTE_DRIVER" != "none" ]; then
>+			REMOTE_ARGS="--driver=$REMOTE_DRIVER $REMOTE_ARGS"
>+		fi
>+	fi
>+	echo $REMOTE_ARGS
>+}
>+
> start() {
>+    REMOTE_LIRCD_ARGS=`build_remote_args $REMOTE_LIRCD_ARGS`
>+
>     echo -n $"Starting infrared remote control daemon ($prog): "
>-    daemon $exec $LIRCD_OPTIONS
>+    daemon $exec $REMOTE_LIRCD_ARGS $LIRCD_OPTIONS
>     retval=$?
>     echo
>     status $prog >/dev/null 2>&1
>Index: lirc.sysconfig
>===================================================================
>RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.sysconfig,v
>retrieving revision 1.1
>diff -u -p -u -p -r1.1 lirc.sysconfig
>--- lirc.sysconfig	5 Dec 2004 23:17:51 -0000	1.1
>+++ lirc.sysconfig	12 May 2008 13:57:43 -0000
>@@ -1,13 +1,23 @@
> # Note: in addition to these parameters, you need to have working    -*- sh -*-
> # configuration file for lircd (and lircmd if enabled).
> 
>-# Options to lircd(8).  Typically, at least a remote controller driver
>-# ("-H foo") needs to be specified here.  Run "/usr/sbin/lircd -H help" to get
>-# a listing of supported drivers.
>+# Options to lircd(8).  Typically, this will be empty, as which driver to use
>+# should be specified using the REMOTE_DRIVER variable below.
> LIRCD_OPTIONS=""
> 
>+# The remote controller driver to be used by lircd(8), similar to
>+# passing "-H driver" to lircd(8).
>+# Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
>+REMOTE_DRIVER=""
>+
>+# Which lirc device will be used by lircd(8).
>+# This is the same as passing "-d device" to lircd.
>+# An empty value will use the default /dev/lirc device.
>+REMOTE_DEVICE=""
>+
> # If "yes", the init script will try to start lircmd(8) too.
> ENABLE_LIRCMD="no"
> 
> # Options to lircmd(8).
> LIRCMD_OPTIONS=""
>+

Actions: View | Diff

Attachments on bug 442341: 302343 | 305130