-rw-r--r-- | library/storage.cpp | 5 |
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() | |||
142 | if ( mntfp ) | 142 | if ( mntfp ) |
143 | { | 143 | { |
144 | while ( (me = getmntent( mntfp )) != 0 ) | 144 | while ( (me = getmntent( mntfp )) != 0 ) |
145 | { | 145 | { |
146 | QString fs = me->mnt_fsname; | 146 | QString fs = me->mnt_fsname; |
147 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" | 147 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" |
148 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" | 148 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" |
149 | || fs.left( 14 ) == "/dev/mmc/part1" | 149 | || fs.left( 14 ) == "/dev/mmc/part1" |
150 | || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" ) | 150 | || fs.left(5)=="tmpfs" || fs.left(11)=="/dev/mmcblk" |
151 | || fs.left(9)=="/dev/root" ) | ||
151 | { | 152 | { |
152 | n++; | 153 | n++; |
153 | curdisks.append(fs); | 154 | curdisks.append(fs); |
154 | curopts.append( me->mnt_opts ); | 155 | curopts.append( me->mnt_opts ); |
155 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); | 156 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); |
156 | curfs.append( me->mnt_dir ); | 157 | curfs.append( me->mnt_dir ); |
157 | bool found = FALSE; | 158 | bool found = FALSE; |
158 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | 159 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) |
@@ -191,17 +192,17 @@ void StorageInfo::update() | |||
191 | { | 192 | { |
192 | humanname = tr("Hard Disk"); | 193 | humanname = tr("Hard Disk"); |
193 | } | 194 | } |
194 | else if ( disk.left(9) == "/dev/mmcd" ) | 195 | else if ( disk.left(9) == "/dev/mmcd" ) |
195 | { | 196 | { |
196 | humanname = tr("SD Card"); | 197 | humanname = tr("SD Card"); |
197 | removable = TRUE; | 198 | removable = TRUE; |
198 | } | 199 | } |
199 | else if ( disk.left( 14 ) == "/dev/mmc/part1" ) | 200 | else if ( disk.left( 14 ) == "/dev/mmc/part1" || disk.left(11) == "/dev/mmcblk" ) |
200 | { | 201 | { |
201 | humanname = tr("MMC Card"); | 202 | humanname = tr("MMC Card"); |
202 | removable = TRUE; | 203 | removable = TRUE; |
203 | } | 204 | } |
204 | else if ( disk.left(7) == "/dev/hd" ) | 205 | else if ( disk.left(7) == "/dev/hd" ) |
205 | humanname = tr("Hard Disk") + " " + disk; | 206 | humanname = tr("Hard Disk") + " " + disk; |
206 | else if ( disk.left(7) == "/dev/sd" ) | 207 | else if ( disk.left(7) == "/dev/sd" ) |
207 | humanname = tr("SCSI Hard Disk") + " " + disk; | 208 | humanname = tr("SCSI Hard Disk") + " " + disk; |