author | kergoth <kergoth> | 2003-03-28 07:50:40 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-28 07:50:40 (UTC) |
commit | 5088d775fe68ac0dd1b6b9923ab66d30ce1d848a (patch) (side-by-side diff) | |
tree | b1c0a0330395bc1136715ad2b92dd5330379cba8 | |
parent | 827e06044df4df235912156c730baa3c87717526 (diff) | |
download | opie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.zip opie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.tar.gz opie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.tar.bz2 |
Ensure StorageInfo picks up /dev/root
-rw-r--r-- | library/storage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index 912b22d..f4c1c02 100644 --- a/library/storage.cpp +++ b/library/storage.cpp @@ -102,25 +102,25 @@ void StorageInfo::update() QStringList curdisks; QStringList curopts; QStringList curfs; bool rebuild = FALSE; int n=0; 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(5)=="tmpfs" || 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) { if ( (*i)->disk() == fs ) { found = TRUE; break; } @@ -156,24 +156,26 @@ void StorageInfo::update() } 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; else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs humanname = tr("Internal Memory"); else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) humanname = tr("Internal Storage"); else if ( disk.left(14) == "/dev/mtdblock/" ) humanname = tr("Internal Storage") + " " + disk; else if ( disk.left(13) == "/dev/mtdblock" ) humanname = tr("Internal Storage") + " " + disk; + else if ( disk.left(9) == "/dev/root" ) + humanname = tr("Internal Storage") + " " + disk; else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs humanname = tr("Internal Memory"); FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); mFileSystems.append( fs ); } emit disksChanged(); } else { // just update them for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) i.current()->update(); } #endif |