Author: pebender
Date: Fri Nov 7 08:56:31 2008
New Revision: 3927
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-configure.html
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
Log:
- Removed support for MM_TYPE_INIT=sh.
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 Fri Nov 7
08:56:31 2008
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 59 (2008-11-06):
+Changes since 59 (2008-11-07):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -18,6 +18,7 @@
- Removed evtouch input driver.
Modified init
+ - Removed support for MM_TYPE_INIT=sh.
- Added ability to disable the power button by setting
MM_ACPI_EVENT_BUTTON_POWER='none'.
- Moved sh based init from '/etc/rc.d' to '/etc/rc.d.sh'.
Modified: trunk/gar-minimyth/html/minimyth/document-configure.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-configure.html (original)
+++ trunk/gar-minimyth/html/minimyth/document-configure.html Fri Nov 7
08:56:31 2008
@@ -32,7 +32,6 @@
<dt><a href="#location">Location of configuration
files</a></dt>
<dt><a href="#minimyth_conf">Configuration obtained from the
MiniMyth configuration file</a></dt>
<dt><a href="#minimyth_pm">Configuration obtained from the
MiniMyth configuration package</a></dt>
- <dt><a href="#minimyth_script">Configuration obtained from the
MiniMyth configuration script (deprecated)</a></dt>
<dt><a href="#misc">Configuration obtained from miscellaneous
configuration files</a></dt>
</dl>
</div>
@@ -46,7 +45,6 @@
<li><a href="#dhcp">the DHCP server</a>,</li>
<li><a href="#minimyth_conf">the MiniMyth configuration
file</a>,</li>
<li><a href="#minimyth_pm">the MiniMyth configuration
package</a>, and</li>
- <li><a href="#minimyth_script">the MiniMyth configuration
script (deprecated)</a> or</li>
<li><a href="#misc">miscellaneous configuration files</a>.</li>
</ul>
<p>
@@ -98,20 +96,9 @@
</p>
</dd>
</dl>
- <dl>
- <dt id="MM_INIT_TYPE"><strong>MM_INIT_TYPE</strong></dt>
- <dd>
- <p>
- Selects the MiniMyth init script type.
- Valid values are "sh" and "perl", with "perl" being
the default.
- </p>
- </dd>
- </dl>
<p>
In addition to
<a href="MM_DEBUG">MM_DEBUG</a>
- and
- <a href="MM_INIT_TYPE">MM_INIT_TYPE</a>,
you can include any variables found in the
<a href="document-minimyth_conf.html">MiniMyth
Configuration File</a>
on the boot line.
@@ -431,8 +418,6 @@
<div id="minimyth_pm" class="section">
<div class="heading">Configuration obtained from the MiniMyth
configuration package</div>
<p>
- The MiniMyth configuration package used when MiniMyth is using
perl init scripts
- (see <a
href="document-configure.html#MM_INIT_TYPE">MM_INIT_TYPE</a>).
The MiniMyth configuration package is called 'minimyth.pm'.
The MiniMyth configuration package is optional.
Whether or not 'minimyth.pm' is retrieved depends on
@@ -484,42 +469,6 @@
1;
</pre>
</div>
- <div id="minimyth_script" class="section">
- <div class="heading">Configuration obtained from the MiniMyth
configuration script (deprecated)</div>
- <p>
- <em>
- Warning:
- 'minimyth.script' is deprecated.
- Use
- '<a href="#minimyth_pm">minimyth.pm</a>'
- instead.
- </em>
- </p>
- <p>
- The MiniMyth configuration script is called 'minimyth.script'.
- The MiniMyth configuration script is optional.
- Whether or not 'minimyth.script' is retrieved depends on
- '<a
href="document-minimyth_conf.html#MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT">MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT</a>'.
- </p>
- <p>
- MiniMyth executes the MiniMyth configuration script as early
as possible during startup.
- The MiniMyth configuration script is a shell script that is
executed by MiniMyth
- At startup, MiniMyth executes the script
- after retrieving and importing (but not processing) the
MiniMyth configuration file and
- after updating DHCP configuration.
- </p>
- <p>
- As mentioned above 'minimyth.script' is a shell script.
- The following is a stub for the shell script:
- </p>
- <pre>
-#!/bin/sh
-
-. /etc/rc.d.sh/functions
-
-exit 0
- </pre>
- </div>
<div id="misc" class="section">
<div class="heading">Configuration obtained from miscellaneous
configuration files</div>
<p>
@@ -705,7 +654,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-11-06
+ Last Updated on 2008-11-07
<br />
< mailto : webmaster at minimyth dot org >
</div>
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 Fri Nov
7
08:56:31 2008
@@ -84,7 +84,6 @@
<ul>
<li><a
href="#MM_MINIMYTH_UPDATE_URL">MM_MINIMYTH_UPDATE_URL</a></li>
<li><a
href="#MM_MINIMYTH_BOOT_URL">MM_MINIMYTH_BOOT_URL</a></li>
- <li><a
href="#MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT">MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT
(deprecated)</a></li>
<li><a
href="#MM_MINIMYTH_FETCH_MINIMYTH_PM">MM_MINIMYTH_FETCH_MINIMYTH_PM</a></li>
</ul>
<dl>
@@ -225,29 +224,6 @@
file from the frontend's MiniMyth read-only configuration
directory.
Valid values are 'yes' and 'no', with 'no' the default.
</p>
- <p>
- The variable is only valid when
- '<a
href="document-configure.html#MM_INIT_TYPE">MM_INIT_TYPE</a>' is 'perl'.
- </p>
- </dd>
- <dt
id="MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT"><strong>MM_MINIMYTH_FETCH_MINIMYTH_SCRIPT
(deprecated)</strong></dt>
- <dd>
- <p>
- <em>
- Warning:
- '<a
href="document-configure.html#minimyth_script">minimyth.script</a>'
- is deprecated.
- Use
- '<a
href="document-configure.html#minimyth_pm">minimyth.pm</a>'
- instead.
- </em>
- </p>
- <p>
- Indicate whether or not to fetch the
- '<a
href="document-configure.html#minimyth_script">minimyth.script</a>'
- file from the frontend's MiniMyth read-only configuration
directory.
- Valid values are 'yes' and 'no', with 'no' the default.
- </p>
</dd>
</dl>
</div>
@@ -2890,7 +2866,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-11-04
+ Last Updated on 2008-11-07
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
==============================================================================
--- trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
(original)
+++ trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
Fri Nov 7 08:56:31 2008
@@ -12,7 +12,9 @@
/bin/echo -n "start date and time: " >> /init.log
/bin/date -u +'%Y-%m-%d %H:%M:%S %Z' >> /init.log
-MM_INIT_TYPE=${MM_INIT_TYPE:-'perl'}
+if /usr/bin/test ! "${MM_INIT_TYPE}" = 'perl' ; then
+ MM_INIT_TYPE=${MM_INIT_TYPE:-'perl'}
+fi
# Save boot line options that we need later.
/bin/mkdir -p /etc/conf.d/
@@ -20,11 +22,10 @@
set | /bin/grep -e '^initrd=' >> /etc/conf.d/boot
set | /bin/grep -e '^MM_' >> /etc/conf.d/boot
-if /usr/bin/test ${MM_INIT_TYPE} = 'sh' ; then
- /bin/ln -s /etc/inittab.sh /etc/inittab
-fi
-if /usr/bin/test ${MM_INIT_TYPE} = 'perl' ; then
+if /usr/bin/test ${MM_INIT_TYPE} = 'perl' ; then
/bin/ln -s /etc/inittab.perl /etc/inittab
+elif /usr/bin/test ${MM_INIT_TYPE} = 'sh-obsolete' ; then
+ /bin/ln -s /etc/inittab.sh /etc/inittab
fi
# Change root to the read-write root file system and start the real init.
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
