summaryrefslogtreecommitdiff
path: root/library
authoralwin <alwin>2005-03-03 22:38:59 (UTC)
committer alwin <alwin>2005-03-03 22:38:59 (UTC)
commite007cb2e4e3627ece4a093bc976debd6366ed1fa (patch) (side-by-side diff)
treecdc8f70802fc167f698dcc647d048c4bac332878 /library
parent98af15f829dadf9083e5e897328ab58e5e82a0fd (diff)
downloadopie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.zip
opie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.tar.gz
opie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.tar.bz2
added device names for 2.6 kernel
Diffstat (limited to 'library') (more/less context) (show whitespace changes)
-rw-r--r--library/storage.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index fcee689..9549ff3 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -142,17 +142,18 @@ void StorageInfo::update()
if ( mntfp )
{
while ( (me = getmntent( mntfp )) != 0 )
{
QString fs = me->mnt_fsname;
if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
|| fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
|| fs.left( 14 ) == "/dev/mmc/part1"
- || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" )
+ || fs.left(5)=="tmpfs" || fs.left(11)=="/dev/mmcblk"
+ || fs.left(9)=="/dev/root" )
{
n++;
curdisks.append(fs);
curopts.append( me->mnt_opts );
//qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
curfs.append( me->mnt_dir );
bool found = FALSE;
for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
@@ -191,17 +192,17 @@ void StorageInfo::update()
{
humanname = tr("Hard Disk");
}
else if ( disk.left(9) == "/dev/mmcd" )
{
humanname = tr("SD Card");
removable = TRUE;
}
- else if ( disk.left( 14 ) == "/dev/mmc/part1" )
+ else if ( disk.left( 14 ) == "/dev/mmc/part1" || disk.left(11) == "/dev/mmcblk" )
{
humanname = tr("MMC Card");
removable = TRUE;
}
else if ( disk.left(7) == "/dev/hd" )
humanname = tr("Hard Disk") + " " + disk;
else if ( disk.left(7) == "/dev/sd" )
humanname = tr("SCSI Hard Disk") + " " + disk;