Author: pebender
Date: Tue Dec 30 22:02:59 2008
New Revision: 4155
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/initrd/sbin/init
Log:
- Obsoleted sh init scripts
- MM_INIT_TYPE=sh will no longer work
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 Tue Dec 30
22:02:59 2008
@@ -12,6 +12,9 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19479.
MythTV trunk: version trunk.19487 trunk svn 19487.
+Obsoleted sh init scripts
+ - MM_INIT_TYPE=sh will no longer work.
+
Modified MiniMyth configuration
- Obsoleted MM_WIIMOTE_ENABLED.
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
Tue Dec 30 22:02:59 2008
@@ -12,9 +12,8 @@
/bin/echo -n "start date and time: " >> /init.log
/bin/date -u +'%Y-%m-%d %H:%M:%S %Z' >> /init.log
-if /usr/bin/test ! "${MM_INIT_TYPE}" = 'perl' && \
- /usr/bin/test ! "${MM_INIT_TYPE}" = 'sh' ; then
- MM_INIT_TYPE=${MM_INIT_TYPE:-'perl'}
+if /usr/bin/test -z "${MM_INIT_TYPE}" ; then
+ MM_INIT_TYPE='perl'
fi
# Save boot line options that we need later.
@@ -23,10 +22,13 @@
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} = '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' ; then
+elif /usr/bin/test ${MM_INIT_TYPE} = 'sh.obsolete' ; then
/bin/ln -s /etc/inittab.sh /etc/inittab
+else
+ /bin/echo "error: MM_INIT_TYPE=${MM_INIT_TYPE} is invalid."
+ exit 1
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
-~----------~----~----~----~------~----~------~--~---
