summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-28 16:58:47 (UTC)
committer llornkcor <llornkcor>2002-05-28 16:58:47 (UTC)
commit9ec323fe6ae0f1f737749d3d63ffaa4a04c55973 (patch) (unidiff)
treea1e65a6c72d131157728e93fbefc587f962da28d
parentf1f06e4cf8ec641852d1d464d8fa8c95b9d2fcb5 (diff)
downloadopie-9ec323fe6ae0f1f737749d3d63ffaa4a04c55973.zip
opie-9ec323fe6ae0f1f737749d3d63ffaa4a04c55973.tar.gz
opie-9ec323fe6ae0f1f737749d3d63ffaa4a04c55973.tar.bz2
fixed bug where not knowing /dev/ramfs
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/storage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index a4c96be..b4d743e 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -101,13 +101,14 @@ void StorageInfo::update()
101 bool rebuild = FALSE; 101 bool rebuild = FALSE;
102 int n=0; 102 int n=0;
103 if ( mntfp ) { 103 if ( mntfp ) {
104 while ( (me = getmntent( mntfp )) != 0 ) { 104 while ( (me = getmntent( mntfp )) != 0 ) {
105 QString fs = me->mnt_fsname; 105 QString fs = me->mnt_fsname;
106 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 106 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
107 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" ) 107 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
108 || fs.left(8)=="/dev/ram")
108 { 109 {
109 n++; 110 n++;
110 curdisks.append(fs); 111 curdisks.append(fs);
111 curopts.append( me->mnt_opts ); 112 curopts.append( me->mnt_opts );
112 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); 113 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
113 curfs.append( me->mnt_dir ); 114 curfs.append( me->mnt_dir );
@@ -150,12 +151,14 @@ void StorageInfo::update()
150 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) 151 else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
151 humanname = tr("Internal Storage"); 152 humanname = tr("Internal Storage");
152 else if ( disk.left(14) == "/dev/mtdblock/" ) 153 else if ( disk.left(14) == "/dev/mtdblock/" )
153 humanname = tr("Internal Storage") + " " + humanname.mid(14); 154 humanname = tr("Internal Storage") + " " + humanname.mid(14);
154 else if ( disk.left(13) == "/dev/mtdblock" ) 155 else if ( disk.left(13) == "/dev/mtdblock" )
155 humanname = tr("Internal Storage") + " " + humanname.mid(13); 156 humanname = tr("Internal Storage") + " " + humanname.mid(13);
157 else if ( disk.left(10) == "/dev/ramfs" )
158 humanname = tr("Internal Storage") + " " + humanname.mid(10);
156 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts ); 159 FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
157 mFileSystems.append( fs ); 160 mFileSystems.append( fs );
158 } 161 }
159 emit disksChanged(); 162 emit disksChanged();
160 } else { 163 } else {
161 // just update them 164 // just update them