Author: pebender
Date: Mon Apr 6 21:40:07 2009
New Revision: 4564
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_is_boot
(contents, props changed)
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-configure.html
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
Log:
- Added /dev/disk/by-kernel and /dev/disk/by-uuid symbol links.
- Added boot line variable MM_MINIMYTH_BOOT_DEVICE for overriding the
device that MiniMyth will mount as the local MiniMyth boot directory
/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 Mon Apr 6
21:40:07 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 65 (2009-04-05):
+Changes since 65 (2009-04-06):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -24,6 +24,10 @@
/usr/bin/dbus-uuidgen is present.
- Added generation of /etc/pango/pango.modules to the gtk init script
when
/usr/bin/pango-querymodules is present.
+ - Added /dev/disk/by-kernel and /dev/disk/by-uuid symbol links.
+ - Added boot line variable MM_MINIMYTH_BOOT_DEVICE for overriding the
+ device that MiniMyth will mount as the local MiniMyth boot directory
+ /minimyth.
Modified kernel
- Enabled IP multicast to so the kernel can drop IPTV multicast
traffic.
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 Mon Apr 6
21:40:07 2009
@@ -96,10 +96,23 @@
Valid values are "yes" and "no", with "no" being the
default.
</p>
</dd>
+ <dt
id="MM_MINIMYTH_BOOT_DEVICE"><strong>MM_MINIMYTH_BOOT_DEVICE</strong></dt>
+ <dd>
+ <p>
+ Sets the device that will be mounted as the local
MiniMyth boot directory ('/minimyth').
+ Valid values are any device in the
directory "/dev/disk", with "/dev/disk/by-label/minimyth" being the default.
+ </p>
+ <p>
+ While MiniMyth will mount the device specified by
MM_MINIMYTH_BOOT_DEVICE as '/minimyth',
+ it will not use '/minimyth' as the MiniMyth boot
directory unless
+ <a
href="document-minimyth_conf.html#MM_MINIMYTH_BOOT_URL">MM_MINIMYTH_BOOT_URL</a>='file:/minimyth/'.
+ </p>
+ </dd>
</dl>
<p>
In addition to
- <a href="MM_DEBUG">MM_DEBUG</a>
+ <a href="MM_DEBUG">MM_DEBUG</a> and
+ <a
href="MM_MINIMYTH_BOOT_DEVICE">MM_MINIMYTH_BOOT_DEVICE</a>
you can include any variables found in the
<a href="document-minimyth_conf.html">MiniMyth
Configuration File</a>
on the boot line.
@@ -393,7 +406,8 @@
then you put the MiniMyth configuration directories in the
same directory on the TFTP server as the network boot loader
(called 'pxelinux.0' when using PXELinux), and that
if you local boot MiniMyth,
- then you put the MiniMyth configuration directories at the
root of the partition labeled 'minimyth',
+ then you put the MiniMyth configuration directories at the
root of the partition specified by
+ <a href="#MM_MINIMYTH_BOOT_DEVICE">MM_MINIMYTH_BOOT_DEVICE</a>
which MiniMyth will automatically mount at the mount
point '/minimyth'.
</p>
<p>
@@ -687,7 +701,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2009-02-09
+ Last Updated on 2009-04-06
<br />
< mailto : webmaster at minimyth dot org >
</div>
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_is_boot
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/mm_is_boot
Mon Apr 6 21:40:07 2009
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+device=''
+
+cmdline=`/bin/cat /proc/cmdline`
+/bin/echo " ${cmdline} " | /bin/grep -q -i ' MM_MINIMYTH_BOOT_DEVICE=' 2>
/dev/null
+if /usr/bin/test $? -eq 0 ; then
+ device=`/bin/echo " ${cmdline} " | /bin/sed -e 's%^.*
MM_MINIMYTH_BOOT_DEVICE="\?\([^ "]*\)"\? .*$%\1%'`
+fi
+
+if /usr/bin/test -z ${device} ; then
+ device='/dev/by-label/minimyth'
+fi
+
+for devlink in ${DEVLINKS} ; do
+ if /usr/bin/test "${devlink}" = "${device}" ; then
+ exit 0
+ fi
+done
+
+exit 1
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
Mon Apr 6 21:40:07 2009
@@ -19,13 +19,15 @@
LABEL="begin-add"
IMPORT{program}="/lib/udev/cdrom_id --export $tempnode"
IMPORT{program}="/lib/udev/vol_id --export $tempnode"
- ENV{ID_FS_LABEL}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL}"
+ KERNEL=="?*" , SYMLINK+="disk/by-kernel/%k"
+ ENV{ID_FS_LABEL_ENC}=="?*",
SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+ ENV{ID_FS_UUID_ENC}=="?*" ,
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
LABEL="begin-add-access"
ENV{ID_CDROM}=="?*", OWNER="root", GROUP="cdrom", MODE="0660",
GOTO="end-add-access"
ENV{ID_CDROM}!="?*", OWNER="root", GROUP="disk" , MODE="0660",
GOTO="end-add-access"
LABEL="end-add-access"
LABEL="begin-add-name"
- ENV{ID_FS_LABEL}=="minimyth",
NAME="disk-minimyth", SYMLINK+="%k", GOTO="end-add-name"
+ PROGRAM="/lib/udev/mm_is_boot", NAME="disk-minimyth", SYMLINK+="%k",
GOTO="end-add-name"
ATTR{removable}=="1", GOTO="begin-add-name-removable"
GOTO="end-add-name-removable"
LABEL="begin-add-name-removable"
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
