summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 19:10:24 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 19:10:24 +0000
commitacaecef0c0cc287990ca400bd15bf38be4f35012 (patch)
tree1a40d5dc32dacc9c2add692bb46fdda78e29c58f /urpm
parentba49e3c02d697f9bab8f02dfb3657606c2c78922 (diff)
downloadurpmi-acaecef0c0cc287990ca400bd15bf38be4f35012.tar
urpmi-acaecef0c0cc287990ca400bd15bf38be4f35012.tar.gz
urpmi-acaecef0c0cc287990ca400bd15bf38be4f35012.tar.bz2
urpmi-acaecef0c0cc287990ca400bd15bf38be4f35012.tar.xz
urpmi-acaecef0c0cc287990ca400bd15bf38be4f35012.zip
supermount is dead!
Diffstat (limited to 'urpm')
-rw-r--r--urpm/sys.pm22
1 files changed, 2 insertions, 20 deletions
diff --git a/urpm/sys.pm b/urpm/sys.pm
index 91c38b06..a6c6bc91 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -39,16 +39,7 @@ sub find_mntpoints {
$mntpoint =~ s,/+,/,g; $mntpoint =~ s,/$,,;
$fstab{$mntpoint} = 0;
if (ref($infos)) {
- if ($fstype eq 'supermount') {
- $options =~ /^(?:.*[\s,])?dev=([^\s,]+)/ and $infos->{$mntpoint} = {
- mounted => 0,
- device => $1,
- fs => $fstype,
- supermount => 1,
- };
- } else {
- $infos->{$mntpoint} = { mounted => 0, device => $device, fs => $fstype };
- }
+ $infos->{$mntpoint} = { mounted => 0, device => $device, fs => $fstype };
}
}
foreach (cat_("/etc/mtab")) {
@@ -57,16 +48,7 @@ sub find_mntpoints {
$mntpoint =~ s,/+,/,g; $mntpoint =~ s,/$,,;
$fstab{$mntpoint} = 1;
if (ref($infos)) {
- if ($fstype eq 'supermount') {
- $options =~ /^(?:.*[\s,])?dev=([^\s,]+)/ and $infos->{$mntpoint} = {
- mounted => 1,
- device => $1,
- fs => $fstype,
- supermount => 1,
- };
- } else {
- $infos->{$mntpoint} = { mounted => 1, device => $device, fs => $fstype };
- }
+ $infos->{$mntpoint} = { mounted => 1, device => $device, fs => $fstype };
}
}