summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-28 07:50:40 (UTC)
committer kergoth <kergoth>2003-03-28 07:50:40 (UTC)
commit5088d775fe68ac0dd1b6b9923ab66d30ce1d848a (patch) (unidiff)
treeb1c0a0330395bc1136715ad2b92dd5330379cba8
parent827e06044df4df235912156c730baa3c87717526 (diff)
downloadopie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.zip
opie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.tar.gz
opie-5088d775fe68ac0dd1b6b9923ab66d30ce1d848a.tar.bz2
Ensure StorageInfo picks up /dev/root
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp4
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
@@ -108,13 +108,13 @@ void StorageInfo::update()
108 if ( mntfp ) { 108 if ( mntfp ) {
109 while ( (me = getmntent( mntfp )) != 0 ) { 109 while ( (me = getmntent( mntfp )) != 0 ) {
110 QString fs = me->mnt_fsname; 110 QString fs = me->mnt_fsname;
111 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 111 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
112 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" 112 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
113 || fs.left( 14 ) == "/dev/mmc/part1" 113 || fs.left( 14 ) == "/dev/mmc/part1"
114 || fs.left(5)=="tmpfs" ) 114 || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" )
115 { 115 {
116 n++; 116 n++;
117 curdisks.append(fs); 117 curdisks.append(fs);
118 curopts.append( me->mnt_opts ); 118 curopts.append( me->mnt_opts );
119 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); 119 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
120 curfs.append( me->mnt_dir ); 120 curfs.append( me->mnt_dir );
@@ -162,12 +162,14 @@ void StorageInfo::update()
162 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) 162 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
163 humanname = tr("Internal Storage"); 163 humanname = tr("Internal Storage");
164 else if ( disk.left(14) == "/dev/mtdblock/" ) 164 else if ( disk.left(14) == "/dev/mtdblock/" )
165 humanname = tr("Internal Storage") + " " + disk; 165 humanname = tr("Internal Storage") + " " + disk;
166 else if ( disk.left(13) == "/dev/mtdblock" ) 166 else if ( disk.left(13) == "/dev/mtdblock" )
167 humanname = tr("Internal Storage") + " " + disk; 167 humanname = tr("Internal Storage") + " " + disk;
168 else if ( disk.left(9) == "/dev/root" )
169 humanname = tr("Internal Storage") + " " + disk;
168 else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs 170 else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
169 humanname = tr("Internal Memory"); 171 humanname = tr("Internal Memory");
170 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); 172 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
171 mFileSystems.append( fs ); 173 mFileSystems.append( fs );
172 } 174 }
173 emit disksChanged(); 175 emit disksChanged();