Author: pebender
Date: Sun Jan 11 12:04:33 2009
New Revision: 4224
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/root/
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/master
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
Log:
- Removed user 'root' MythTV configuration files (i.e.
/root/.mythtv/config.xml and /root/.mythtv/mysql.txt) because all
MythTV programs (mythbackend, mythfrontend and mythwelcome) run as user
'minimyth'.
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 Sun Jan 11
12:04:33 2009
@@ -25,8 +25,6 @@
Modified mediaplayers
- Updated Xine VDPAU support.
-Modified Wiimote
- - Improved checking for whether or not a Wiimote is in use before
Modified kernel
- Added IVTV kernel drivers.
@@ -43,6 +41,10 @@
'/lib/firmware').
- Added support for detecting and fetching required tuner firmware
files.
- Added MM_BACKEND_TUNER_FIRMWARE_FILE_LIST.
+ - Removed user 'root' MythTV configuration files (i.e.
+ /root/.mythtv/config.xml and /root/.mythtv/mysql.txt) because all
+ MythTV programs (mythbackend, mythfrontend and mythwelcome) run as
user
+ 'minimyth'.
Modified udev
- Renamed 06-minimyth-mythtv.rules to 07-minimyth-mythtv.rules.
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sun Jan
11
12:04:33 2009
@@ -1926,9 +1926,6 @@
'<a
href="#MM_MEDIA_TV_MOUNTPOINT">MM_MEDIA_TV_MOUNTPOINT</a>'.
</p>
<p>
- The location specified by MM_MEDIA_TV_URL must be writable
by the user 'minimyth'.
- </p>
- <p>
If MiniMyth is not acting as a MythTV slave backend, then
MM_MEDIA_TV_URL is not needed.
This is because MythTV has its own protocol for streaming
recording from the backend to the frontend.
However, if you want to bybass MythTV's streaming
protocol, then you can set MM_MEDIA_TV_URL.
@@ -1937,6 +1934,11 @@
If MiniMyth is acting as a MythTV slave backend, then
MM_MEDIA_TV_URL should be set.
This is because MythTV needs a location where it can save
television recordings.
</p>
+ <p>
+ The location specified by MM_MEDIA_TV_URL must be readable
by the user 'minimyth'.
+ In addition, if MiniMyth is acting as a MythTV slave
backend,
+ then the location specified by MM_MEDIA_TV_URL must be
writable by the user 'minimyth'.
+ </p>
</dd>
<dt
id="MM_MEDIA_GALLERY_MOUNTPOINT"><strong>MM_MEDIA_GALLERY_MOUNTPOINT</strong></dt>
<dd>
@@ -2847,6 +2849,10 @@
If the value is 'auto', then MiniMyth will decide the
value based on whether or not a tuner is present.
If a tuner is present, then the value will be 'yes'.
Otherwise, the value will be 'no'.
+ </p>
+ <p>
+ If you enable the Myth slave backend functionality,
+ then MiniMyth will run the MythTV backend daemon
('/usr/bin/mythbackend') as user 'minimyth'.
</p>
<p>
If you enable the Myth slave backend functionality, then
you will likely want to use the
Modified: trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile
(original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/source/Makefile Sun Jan
11 12:04:33 2009
@@ -149,6 +149,8 @@
@mkdir -m 0755 -p $(@D)
@rm -rf $@ $...@~
@mkdir -m 0755 -p $...@~
+ @# Make home directory for user 'root'.
+ @mkdir -p $...@~/root
@# Copy source.
@mkdir -p $...@~$(sourcedir)
@cp -pdR $(top_build)/stage/gar-$(mm_NAME).tar.bz2
$...@~$(sourcedir)/gar-$(mm_NAME).tar.bz2
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/master
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/master
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/master
Sun Jan 11 12:04:33 2009
@@ -24,23 +24,13 @@
MASTER_WOL_BROADCAST=`/sbin/ifconfig ${MM_NETWORK_INTERFACE} |
/bin/grep ' Bcast:' | /bin/sed 's%.* Bcast:\([^ ]*\) .*%\1%'`
# Configure config.xml file.
- # The frontend runs as user 'minimyth' and the backend runs as
user 'root'.
- # As a result, there is a config.xml file for both 'minimyth'
and 'root'.
/bin/sed
-i "s...@mm_hostname@%${HOSTNAME}%"
/home/minimyth/.mythtv/config.xml
/bin/sed
-i "s...@mm_master_server@%${MM_MASTER_SERVER}%"
/home/minimyth/.mythtv/config.xml
/bin/sed
-i "s...@mm_master_dbusername@%${MM_MASTER_DBUSERNAME}%"
/home/minimyth/.mythtv/config.xml
/bin/sed
-i "s...@mm_master_dbpassword@%${MM_MASTER_DBPASSWORD}%"
/home/minimyth/.mythtv/config.xml
/bin/sed
-i "s...@mm_master_dbname@%${MM_MASTER_DBNAME}%"
/home/minimyth/.mythtv/config.xml
- /bin/sed
-i "s...@mm_hostname@%${HOSTNAME}%"
/root/.mythtv/config.xml
- /bin/sed
-i "s...@mm_master_server@%${MM_MASTER_SERVER}%"
/root/.mythtv/config.xml
- /bin/sed
-i "s...@mm_master_dbusername@%${MM_MASTER_DBUSERNAME}%"
/root/.mythtv/config.xml
- /bin/sed
-i "s...@mm_master_dbpassword@%${MM_MASTER_DBPASSWORD}%"
/root/.mythtv/config.xml
- /bin/sed
-i "s...@mm_master_dbname@%${MM_MASTER_DBNAME}%"
/root/.mythtv/config.xml
-
# Configure mysql.txt file.
- # The frontend runs as user 'minimyth' and the backend runs as
user 'root'.
- # As a result, there is a mysql.txt file for both 'minimyth'
and 'root'.
/bin/sed
-i "s...@mm_hostname@%${HOSTNAME}%"
/home/minimyth/.mythtv/mysql.txt
/bin/sed
-i "s...@mm_master_server@%${MM_MASTER_SERVER}%"
/home/minimyth/.mythtv/mysql.txt
/bin/sed
-i "s...@mm_master_dbusername@%${MM_MASTER_DBUSERNAME}%"
/home/minimyth/.mythtv/mysql.txt
@@ -58,25 +48,6 @@
/bin/sed
-i "s...@mm_master_wolsqlcommand@%${MM_MASTER_WOLSQLCOMMAND}%"
/home/minimyth/.mythtv/mysql.txt
/bin/sed
-i "s...@mm_master_wol_broadcast@%${MASTER_WOL_BROADCAST}%"
/home/minimyth/.mythtv/mysql.txt
/bin/sed
-i "s...@mm_master_wol_mac@%${MM_MASTER_WOL_MAC}%"
/home/minimyth/.mythtv/mysql.txt
-
- /bin/sed
-i "s...@mm_hostname@%${HOSTNAME}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_server@%${MM_MASTER_SERVER}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_dbusername@%${MM_MASTER_DBUSERNAME}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_dbpassword@%${MM_MASTER_DBPASSWORD}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_dbname@%${MM_MASTER_DBNAME}%"
/root/.mythtv/mysql.txt
- if /usr/bin/test "${MM_MASTER_WOL_ENABLED}" = "yes" ; then
- /bin/sed
-i "s...@mm_master_wol_false@%\#%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wol_true@%%"
/root/.mythtv/mysql.txt
- else
- /bin/sed
-i "s...@mm_master_wol_false@%%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wol_true@%\#%"
/root/.mythtv/mysql.txt
- fi
- /bin/sed
-i
"s...@mm_master_wolsqlreconnectwaittime@%${MM_MASTER_WOLSQLRECONNECTWAITTIME}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wolsqlconnectretry@%${MM_MASTER_WOLSQLCONNECTRETRY}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wolsqlcommand@%${MM_MASTER_WOLSQLCOMMAND}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wol_broadcast@%${MASTER_WOL_BROADCAST}%"
/root/.mythtv/mysql.txt
- /bin/sed
-i "s...@mm_master_wol_mac@%${MM_MASTER_WOL_MAC}%"
/root/.mythtv/mysql.txt
-
# If using wake-on-lan, then make sure that the MythTV master backend
is awake.
if /usr/bin/test "${MM_MASTER_WOL_ENABLED}" = "yes" && !
mm_mythdb_test ; then
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/master.pm
Sun Jan 11 12:04:33 2009
@@ -33,8 +33,6 @@
}
# Configure config.xml file.
- # The frontend runs as user 'minimyth' and the backend runs as
user 'root'.
- # As a result, there is a config.xml file for both 'minimyth'
and 'root'.
$minimyth->file_replace_variable(
'/home/minimyth/.mythtv/config.xml',
{ '@MM_HOSTNAME@' => $hostname,
@@ -42,17 +40,8 @@
'@MM_MASTER_DBUSERNAME@' =>
$minimyth->var_get('MM_MASTER_DBUSERNAME'),
'@MM_MASTER_DBPASSWORD@' =>
$minimyth->var_get('MM_MASTER_DBPASSWORD'),
'@MM_MASTER_DBNAME@' =>
$minimyth->var_get('MM_MASTER_DBNAME') });
- $minimyth->file_replace_variable(
- '/root/.mythtv/config.xml',
- { '@MM_HOSTNAME@' => $hostname,
- '@MM_MASTER_SERVER@' =>
$minimyth->var_get('MM_MASTER_SERVER'),
- '@MM_MASTER_DBUSERNAME@' =>
$minimyth->var_get('MM_MASTER_DBUSERNAME'),
- '@MM_MASTER_DBPASSWORD@' =>
$minimyth->var_get('MM_MASTER_DBPASSWORD'),
- '@MM_MASTER_DBNAME@' =>
$minimyth->var_get('MM_MASTER_DBNAME') });
# Configure mysql.txt file.
- # The frontend runs as user 'minimyth' and the backend runs as
user 'root'.
- # As a result, there is a mysql.txt file for both 'minimyth'
and 'root'.
my $wol_false;
my $wol_true;
if ($minimyth->var_get('MM_MASTER_WOL_ENABLED') eq 'yes')
@@ -81,22 +70,6 @@
'@MM_MASTER_WOLSQLCOMMAND@' =>
$minimyth->var_get('MM_MASTER_WOLSQLCOMMAND') });
$minimyth->file_replace_variable(
'/home/minimyth/.mythtv/mysql.txt',
- { '@MM_MASTER_WOL_BROADCAST@' => $master_wol_broadcast,
- '@MM_MASTER_WOL_MAC@' =>
$minimyth->var_get('MM_MASTER_WOL_MAC') });
- $minimyth->file_replace_variable(
- '/root/.mythtv/mysql.txt',
- { '@MM_HOSTNAME@' => $hostname,
- '@MM_MASTER_SERVER@' =>
$minimyth->var_get('MM_MASTER_SERVER'),
- '@MM_MASTER_DBUSERNAME@' =>
$minimyth->var_get('MM_MASTER_DBUSERNAME'),
- '@MM_MASTER_DBPASSWORD@' =>
$minimyth->var_get('MM_MASTER_DBPASSWORD'),
- '@MM_MASTER_DBNAME@' =>
$minimyth->var_get('MM_MASTER_DBNAME'),
- '@MM_MASTER_WOL_FALSE@' => $wol_false,
- '@MM_MASTER_WOL_TRUE@' => $wol_true,
- '@MM_MASTER_WOLSQLRECONNECTWAITTIME@' =>
$minimyth->var_get('MM_MASTER_WOLSQLRECONNECTWAITTIME'),
- '@MM_MASTER_WOLSQLCONNECTRETRY@' =>
$minimyth->var_get('MM_MASTER_WOLSQLCONNECTRETRY'),
- '@MM_MASTER_WOLSQLCOMMAND@' =>
$minimyth->var_get('MM_MASTER_WOLSQLCOMMAND') });
- $minimyth->file_replace_variable(
- '/root/.mythtv/mysql.txt',
{ '@MM_MASTER_WOL_BROADCAST@' => $master_wol_broadcast,
'@MM_MASTER_WOL_MAC@' =>
$minimyth->var_get('MM_MASTER_WOL_MAC') });
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
