Author: pebender
Date: Mon Mar 9 22:21:27 2009
New Revision: 4460
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/rootfs/etc/rc.d.sh/functions
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/shutdown
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_MEDIA.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/shutdown.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/lib/udev/rules.d/04-minimyth-disk.rules
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Added ext3 URL support.
- Added /dev/disk/by-label symbolic links to make ext3 URLs simpler and
more reliable.
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 Mar 9
22:21:27 2009
@@ -13,6 +13,11 @@
patch glvdpau20115.
MythTV trunk: version trunk.20127 trunk svn 20127.
+Improved init
+ - Added ext3 URL support.
+ - Added /dev/disk/by-label symbolic links to make ext3 URLs simpler and
+ more reliable.
+
Improved MythV slave backend support.
- Added Technisat SkyStar2.
- Enabled b2c2-flexcop-pci and related kernel drivers.
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 Mon Mar
9
22:21:27 2009
@@ -44,7 +44,7 @@
<li><a href="#MM_CODECS">Configuration variables for: CODECs
directory</a></li>
<li><a href="#MM_FLASH">Configuration variables for: Adobe
Flash Player</a></li>
<li><a href="#MM_THEME">Configuration variables for:
themes</a></li>
- <li><a href="#MM_MEDIA">Configuration variables for: remote
media directories</a></li>
+ <li><a href="#MM_MEDIA">Configuration variables for: media
directories</a></li>
<li><a href="#MM_GAME">Configuration variables for:
games</a></li>
<li><a href="#MM_WIIMOTE">Configuration variables for: Wii
remote control</a></li>
<li><a href="#MM_LIRC">Configuration variables for:
LIRC</a></li>
@@ -1536,13 +1536,14 @@
For example:
</p>
<p>
- nfs://server.home/home/public/music<br/>
cifs://user:[email protected]/music?domain=home<br/>
+ nfs://server.home/home/public/music<br/>
confrw:themecaches/G.A.N.T..1024.768.sfs<br/>
</p>
<p>
- The valid protocol values
are: 'nfs', 'cifs', 'http', 'tftp', 'confro', 'confrw', 'dist', 'hunt'
and 'file'.
- For 'nfs' and 'cifs' the URL points to a remote directory.
+ The valid protocol values
are: 'cifs', 'nfs', 'ext3', 'http', 'tftp', 'confro', 'confrw', 'dist', 'hunt'
and 'file'.
+ For 'cifs' and 'nfs', the URL points to a remote directory.
+ For 'ext3', the URL points to a local ext3 device.
For 'http', 'tftp', 'confro', 'confrw', 'dist' and 'hunt',
the URL points to a remote file.
For 'file', the URL points to a local directory or file.
A directory will be mounted at the mount point.
@@ -1906,7 +1907,7 @@
</p>
</div>
<div id="MM_MEDIA" class="section">
- <div class="heading">Configuration variables for: remote media
directories</div>
+ <div class="heading">Configuration variables for: media
directories</div>
<ul>
<li><a href="#MM_MEDIA-overview">Overview</a></li>
</ul>
@@ -1929,7 +1930,7 @@
<dt id="MM_MEDIA-overview"><strong>Overview</strong></dt>
<dd>
<p>
- You can mount remote media directories by setting some
variables.
+ You can mount media directories by setting some variables.
</p>
<p>
The URLs in this section must have the form described in
the
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
Mon Mar 9 22:21:27 2009
@@ -691,24 +691,25 @@
# nfs://server.home/home/public/music
# cifs://user:[email protected]/home/public/music,domain=home
# confrw:themecaches/G.A.N.T..1024.768.sfs<br/>
-# The valid protocol values are: 'nfs', 'cifs', 'http', 'tftp',
-# 'confro', 'confrw', 'dist', 'hunt' and 'file'. For 'nfs'
and 'cifs'
-# the URL points to a remote directory.
For 'http', 'tftp', 'confro',
-# 'confrw', 'dist' and 'hunt', the URL points to a remote file. For
-# 'file', the URL point to a local directory or file. A directory
will
-# be mounted at the mount point. A file, which can be a squashfs
image
-# (*.sfs.), cramfs image (*.cmg) or a tarball file (*.tar.bz2)
will be
-# downloaded and mounted at (for *.sfs and *.cmg files) or
downloaded
-# and expanded into (for *.tar.bz2 files) the mount point.
The 'confro',
-# 'confrw', 'dist' and 'hunt' are special MiniMyth specific URLs. A
-# 'dist' URL causes MiniMyth to look for the file in the MiniMyth
-# distribution directory (the directory with the MiniMyth root file
-# system squashfs image). A 'confro' URL causes MiniMyth to look
for the
-# file in the MiniMyth read-only configuration directory.
A 'confrw' URL
-# causes MiniMyth to look for the file in the MiniMyth read-write
-# configuration directory. A 'hunt' URL causes MiniMyth to look
for the
-# file first in the MiniMyth distribution directory and second in
the
-# MiniMyth read-only configuration directory.
+# The valid protocol values
are: 'cifs', 'nfs', 'ext3', 'http', 'tftp',
+# 'confro', 'confrw', 'dist', 'hunt' and 'file'. For 'cifs'
and 'nfs'
+# the URL points to a remote directory. For 'ext3' the URL points
to a
+# local ext3 device.
For 'http', 'tftp', 'confro', 'confrw', 'dist' and
+# 'hunt', the URL points to a remote file. For 'file', the URL
point to
+# a local directory or file. A directory will be mounted at the
mount
+# point. A file, which can be a squashfs image (*.sfs.), cramfs
image
+# (*.cmg) or a tarball file (*.tar.bz2) will be downloaded and
mounted
+# at (for *.sfs and *.cmg files) or downloaded and expanded into
(for
+# *.tar.bz2 files) the mount point. The 'confro', 'confrw', 'dist'
and
+# 'hunt' are special MiniMyth specific URLs. A 'dist' URL causes
+# MiniMyth to look for the file in the MiniMyth distribution
directory
+# (the directory with the MiniMyth root file system squashfs
image). A
+# 'confro' URL causes MiniMyth to look for the file in the MiniMyth
+# read-only configuration directory. A 'confrw' URL causes
MiniMyth to
+# look for the file in the MiniMyth read-write configuration
directory.
+# A 'hunt' URL causes MiniMyth to look for the file first in the
+# MiniMyth distribution directory and second in the MiniMyth
read-only
+# configuration directory.
# MOUNT_DIR: required argument:
# The local directory (e.g. /mnt/music) where the URL will be
mounted.
#-------------------------------------------------------------------------------
@@ -760,11 +761,7 @@
EXTRA_OPTIONS=""
MOUNT_DEVICE=""
MOUNT_OPTIONS="${URL_OPTIONS}"
- if /usr/bin/test "${URL_PROTOCOL}" = "nfs" ; then
- MOUNT_VFSTYPE="nfs"
- MOUNT_DEVICE="${URL_SERVER}:${URL_PATH}"
- MOUNT_OPTIONS="nolock,${MOUNT_OPTIONS}"
- elif /usr/bin/test "${URL_PROTOCOL}" = "cifs" ; then
+ if /usr/bin/test "${URL_PROTOCOL}" = "cifs" ; then
MOUNT_VFSTYPE="cifs"
MOUNT_DEVICE="//${URL_SERVER}${URL_PATH}"
if /usr/bin/test ! "${URL_PASSWORD}" = "" ; then
@@ -773,6 +770,14 @@
if /usr/bin/test ! "${URL_USERNAME}" = "" ; then
MOUNT_OPTIONS="username=${URL_USERNAME},${MOUNT_OPTIONS}"
fi
+ elif /usr/bin/test "${URL_PROTOCOL}" = "nfs" ; then
+ MOUNT_VFSTYPE="nfs"
+ MOUNT_DEVICE="${URL_SERVER}:${URL_PATH}"
+ MOUNT_OPTIONS="nolock,${MOUNT_OPTIONS}"
+ elif /usr/bin/test "${URL_PROTOCOL}" = "ext3" ; then
+ MOUNT_VFSTYPE="ext3"
+ MOUNT_DEVICE="${URL_PATH}"
+ MOUNT_OPTIONS="${MOUNT_OPTIONS}"
elif ( /usr/bin/test "${URL_PROTOCOL}"
= "http" ) || \
( /usr/bin/test "${URL_PROTOCOL}"
= "tftp" ) || \
( /usr/bin/test "${URL_PROTOCOL}"
= "confro" ) || \
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/shutdown
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/shutdown
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/shutdown
Mon Mar 9 22:21:27 2009
@@ -19,7 +19,8 @@
$2 ~ /^\/media\// {print $2 ; next}
$2 ~ /^\/\/minimyth$/ {print $2 ; next}
$3 ~ /^cifs$/ {print $2 ; next}
- $3 ~ /^nfs$/ {print $2 ; next}'
+ $3 ~ /^nfs$/ {print $2 ; next}
+ $3 ~ /^ext3$/ {print $2 ; next}'
# unmount any remaining file systems.
mountpoints=`LANG=C /usr/bin/awk "${script}" '/proc/mounts' |
/usr/bin/sort -r`
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_MEDIA.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_MEDIA.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_MEDIA.pm
Mon Mar 9 22:21:27 2009
@@ -7,7 +7,7 @@
use warnings;
my $dir = '/|(/[[:alnum:]._-]+)+';
-my $url = '(cifs|nfs):(//(([^ :@]*)?(:([^ @]*))?\@)?([^
/]+))?[^ ?#]*(\?([^ #]*))?(\#([^ ]*))?';
+my $url = '(cifs|nfs|ext3):(//(([^ :@]*)?(:([^ @]*))?\@)?([^
/]+))?[^ ?#]*(\?([^ #]*))?(\#([^ ]*))?';
my $value_valid_mountpoint = qq/$dir/;
my $value_valid_url = qq/none|$url/;
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/shutdown.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/shutdown.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/shutdown.pm
Mon Mar 9 22:21:27 2009
@@ -27,7 +27,8 @@
if ( ($2 =~ /^\/media\//) ||
($2 =~ /^\/\/minimyth\//) ||
($3 =~ /^cifs$/) ||
- ($3 =~ /^nfs$/) )
+ ($3 =~ /^nfs$/) ||
+ ($3 =~ /^ext3$/) )
{
unshift(@mountpoints, $mountpoint);
}
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 Mar 9 22:21:27 2009
@@ -19,6 +19,7 @@
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}"
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"
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Mon Mar 9
22:21:27 2009
@@ -1 +1 @@
-130ccd0465e915280c2d1eb862c7b627 download/MiniMyth.pm
+21574571a0758908ca82d292e8011012 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Mon Mar
9 22:21:27 2009
@@ -1459,24 +1459,25 @@
# nfs://server.home/home/public/music
# cifs://user:[email protected]/home/public/music,domain=home
# confrw:themecaches/G.A.N.T..1024.768.sfs<br/>
-# The valid protocol values are: 'nfs', 'cifs', 'http', 'tftp',
-# 'confro', 'confrw', 'dist', 'hunt' and 'file'. For 'nfs'
and 'cifs'
-# the URL points to a remote directory.
For 'http', 'tftp', 'confro',
-# 'confrw', 'dist' and 'hunt', the URL points to a remote file. For
-# 'file', the URL point to a local directory or file. A directory
will
-# be mounted at the mount point. A file, which can be a squashfs
image
-# (*.sfs.), cramfs image (*.cmg) or a tarball file (*.tar.bz2)
will be
-# downloaded and mounted at (for *.sfs and *.cmg files) or
downloaded
-# and expanded into (for *.tar.bz2 files) the mount point.
The 'confro',
-# 'confrw', 'dist' and 'hunt' are special MiniMyth specific URLs. A
-# 'dist' URL causes MiniMyth to look for the file in the MiniMyth
-# distribution directory (the directory with the MiniMyth root file
-# system squashfs image). A 'confro' URL causes MiniMyth to look
for the
-# file in the MiniMyth read-only configuration directory.
A 'confrw' URL
-# causes MiniMyth to look for the file in the MiniMyth read-write
-# configuration directory. A 'hunt' URL causes MiniMyth to look
for the
-# file first in the MiniMyth distribution directory and second in
the
-# MiniMyth read-only configuration directory.
+# The valid protocol values
are: 'cifs', 'nfs', 'ext3', 'http', 'tftp',
+# 'confro', 'confrw', 'dist', 'hunt' and 'file'. For 'cifs'
and 'nfs'
+# the URL points to a remote directory. For 'ext3' the URL points
to a
+# local ext3 device.
For 'http', 'tftp', 'confro', 'confrw', 'dist' and
+# 'hunt', the URL points to a remote file. For 'file', the URL
point to
+# a local directory or file. A directory will be mounted at the
mount
+# point. A file, which can be a squashfs image (*.sfs.), cramfs
image
+# (*.cmg) or a tarball file (*.tar.bz2) will be downloaded and
mounted
+# at (for *.sfs and *.cmg files) or downloaded and expanded into
(for
+# *.tar.bz2 files) the mount point. The 'confro', 'confrw', 'dist'
and
+# 'hunt' are special MiniMyth specific URLs. A 'dist' URL causes
+# MiniMyth to look for the file in the MiniMyth distribution
directory
+# (the directory with the MiniMyth root file system squashfs
image). A
+# 'confro' URL causes MiniMyth to look for the file in the MiniMyth
+# read-only configuration directory. A 'confrw' URL causes
MiniMyth to
+# look for the file in the MiniMyth read-write configuration
directory.
+# A 'hunt' URL causes MiniMyth to look for the file first in the
+# MiniMyth distribution directory and second in the MiniMyth
read-only
+# configuration directory.
# MOUNT_DIR: required argument:
# The local directory (e.g. /mnt/music) where the URL will be
mounted.
#-------------------------------------------------------------------------------
@@ -1510,13 +1511,7 @@
my $extra_options = '';
my $mount_device = '';
my $mount_options = $url_options;
- if ($url_protocol eq 'nfs')
- {
- $mount_vfstype = 'nfs';
- $mount_device = $url_server . ':' . $url_path;
- $mount_options = 'nolock,' . $mount_options;
- }
- elsif ($url_protocol eq 'cifs')
+ if ($url_protocol eq 'cifs')
{
$mount_vfstype = 'cifs';
$mount_device = '//' . $url_server . $url_path;
@@ -1528,6 +1523,18 @@
{
$mount_options = 'username=' . $url_username . ',' .
$mount_options;
}
+ }
+ elsif ($url_protocol eq 'nfs')
+ {
+ $mount_vfstype = 'nfs';
+ $mount_device = $url_server . ':' . $url_path;
+ $mount_options = 'nolock,' . $mount_options;
+ }
+ elsif ($url_protocol eq 'ext3')
+ {
+ $mount_vfstype = 'ext3';
+ $mount_device = $url_path;
+ $mount_options = $mount_options;
}
elsif (( $url_protocol eq 'confro' ) ||
( $url_protocol eq 'confrw' ) ||
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
