Author: pebender
Date: Tue Dec 9 18:50:28 2008
New Revision: 4079
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Log:
- Fixed bug in lircd pid files when lirc device names where modified.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
Tue Dec 9 18:50:28 2008
@@ -210,7 +210,13 @@
# Start daemon.
daemon=
- instance=`/bin/echo ${device} | /bin/sed -e 's%//*%~%g' | /bin/sed
-e 's%^~dev~%%'`
+ instance=${device}
+ for symlink in `/sbin/udevadm info --query=symlink --root
--name="${device}"` ; do
+ if /bin/echo "${symlink}" | grep -q -e '^/dev/persistent' >
/dev/null 2>&1 ; then
+ instance=${symlink}
+ fi
+ done
+ instance=`/bin/echo ${instance} | /bin/sed -e 's%//*%~%g' |
/bin/sed -e 's%^~dev~%%'`
if /usr/bin/test -n "${daemon_master}" ; then
daemon="/usr/sbin/lircd"
daemon="${daemon} --device=${device} --driver=${driver}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Tue Dec 9 18:50:28 2008
@@ -312,6 +312,19 @@
# Start daemon.
my $daemon = '';
my $instance = $device;
+ if (($device) && (open(FILE, '-|', qq(/sbin/udevadm info
--query=symlink --root --name='$device'))))
+ {
+ while (<FILE>)
+ {
+ chomp;
+ if (/^\/dev\/persistent\//)
+ {
+ $instance = $_;
+ last;
+ }
+ }
+ close(FILE);
+ }
$instance =~ s/\/+/~/g;
$instance =~ s/^~dev~//;
if ($daemon_master)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
