Author: pebender
Date: Sat Jan 17 15:32:04 2009
New Revision: 4268
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/backend
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_BACKEND
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_DEBUG
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_BACKEND.pm
trunk/gar-minimyth/script/minimyth.conf.mk
Log:
- Added MM_BACKEND_DEBUG_LEVEL.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Jan 17
15:32:04 2009
@@ -19,7 +19,7 @@
- Added lircd.conf files for the Hauppauge R808 and Hauppauge A415
remotes
using the PVR-250 card receiver.
- Added autoconfiguration of the PVR-250 IR receiver.
- - Added MM_BACKEND_TUNER_FIRMWARE_FILE_LIST.
+ - Added MM_BACKEND_DEBUG_LEVEL and MM_BACKEND_TUNER_FIRMWARE_FILE_LIST.
- Added 'Slave Backend Tools' item to 'MiniMyth Tools' for starting,
stopping, and configuring (launching 'mythtv-setup') the slave
backend.
- Modified the backend init script so that it logs the output of
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/backend
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/backend
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/backend
Sat Jan 17 15:32:04 2009
@@ -12,7 +12,7 @@
mm_message_output info "starting MythTV backend ..."
if /usr/bin/test -e '/usr/bin/mythbackend' ; then
- /bin/su -c "/usr/bin/mythbackend 2>&1 | /usr/bin/logger -t
mythbackend -p local0.info" - minimyth &
+ /bin/su -c "/usr/bin/mythbackend -v ${MM_BACKEND_DEBUG_LEVEL}
2>&1 | /usr/bin/logger -t mythbackend -p local0.info" - minimyth &
else
mm_message_output err "error: '/usr/bin/mythbackend' not
found."
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_BACKEND
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_BACKEND
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_BACKEND
Sat Jan 17 15:32:04 2009
@@ -26,9 +26,19 @@
local firmware_item
local firmware_list
+ # The routine relies on MM_DEBUG_* variables.
+ conf_default_MM_DEBUG
+
if /usr/bin/test -z "${MM_BACKEND_ENABLED}" ; then
MM_BACKEND_ENABLED='auto'
fi
+ if /usr/bin/test -z "${MM_BACKEND_DEBUG_LEVEL}" ; then
+ if /usr/bin/test "${MM_DEBUG}" = "yes" ; then
+ MM_BACKEND_DEBUG_LEVEL='all',
+ else
+ MM_BACKEND_DEBUG_LEVEL='none',
+ fi
+ fi
if /usr/bin/test -z "${MM_BACKEND_TUNER_FIRMWARE_FILE_LIST}" ; then
MM_BACKEND_TUNER_FIRMWARE_FILE_LIST='auto'
fi
@@ -66,6 +76,7 @@
local conf_file=$1
conf_variable_write "${conf_file}"
MM_BACKEND_ENABLED "${MM_BACKEND_ENABLED}"
+ conf_variable_write "${conf_file}"
MM_BACKEND_DEBUG_LEVEL "${MM_BACKEND_DEBUG_LEVEL}"
conf_variable_write "${conf_file}"
MM_BACKEND_TUNER_FIRMWARE_FILE_LIST "${MM_BACKEND_TUNER_FIRMWARE_FILE_LIST}"
return 0
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_DEBUG
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_DEBUG
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_DEBUG
Sat Jan 17 15:32:04 2009
@@ -18,9 +18,17 @@
}
conf_default_MM_DEBUG() {
+ if /usr/bin/test -e '/tmp/init.conf.debug/conf_default_MM_DEBUG' ; then
+ return 0
+ fi
+
if /usr/bin/test -z "${MM_DEBUG}" ; then
MM_DEBUG='no'
fi
+
+ /bin/mkdir -p '/tmp/init.conf.debug'
+ /bin/touch '/tmp/init.conf.debug/conf_default_MM_DEBUG'
+
return 0
}
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/backend.pm
Sat Jan 17 15:32:04 2009
@@ -19,7 +19,8 @@
if (-x '/usr/bin/mythbackend')
{
- system(qq(/bin/su -c "/usr/bin/mythbackend 2>&1 |
/usr/bin/logger -t mythbackend -p local0.info" - minimyth &));
+ my $debug_level = $minimyth->var_get('MM_BACKEND_DEBUG_LEVEL');
+ system(qq(/bin/su -c "/usr/bin/mythbackend -v $debug_level
2>&1 | /usr/bin/logger -t mythbackend -p local0.info" - minimyth &));
}
else
{
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_BACKEND.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_BACKEND.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_BACKEND.pm
Sat Jan 17 15:32:04 2009
@@ -34,6 +34,26 @@
}
};
+$var_list{'MM_BACKEND_DEBUG_LEVEL'} =
+{
+ prerequisite => ['MM_DEBUG'],
+ value_default => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ if ($minimyth->var_get('MM_DEBUG') eq 'yes')
+ {
+ return 'all';
+ }
+ else
+ {
+ return 'none';
+ }
+ },
+ value_valid => 'none|most|all|[[:alnum:],]+'
+};
+
$var_list{'MM_BACKEND_TUNER_FIRMWARE_FILE_LIST'} =
{
value_default => 'auto',
Modified: trunk/gar-minimyth/script/minimyth.conf.mk
==============================================================================
--- trunk/gar-minimyth/script/minimyth.conf.mk (original)
+++ trunk/gar-minimyth/script/minimyth.conf.mk Sat Jan 17 15:32:04 2009
@@ -18,7 +18,7 @@
)
# Configuration file (minimyth.conf) version.
-mm_CONF_VERSION ?= 39
+mm_CONF_VERSION ?= 40
#-------------------------------------------------------------------------------
# Variables that you are likely to be override based on your environment.
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
