summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 19:11:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 19:11:13 +0000
commitcf54c60c29c84c85e7245eb896feeedc14c8b3c6 (patch)
treeaae64502312aa2d66afd481c24c145c12ec76238
parentacaecef0c0cc287990ca400bd15bf38be4f35012 (diff)
downloadurpmi-cf54c60c29c84c85e7245eb896feeedc14c8b3c6.tar
urpmi-cf54c60c29c84c85e7245eb896feeedc14c8b3c6.tar.gz
urpmi-cf54c60c29c84c85e7245eb896feeedc14c8b3c6.tar.bz2
urpmi-cf54c60c29c84c85e7245eb896feeedc14c8b3c6.tar.xz
urpmi-cf54c60c29c84c85e7245eb896feeedc14c8b3c6.zip
supermount is dead!
-rw-r--r--urpm/removable.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm
index f215bf84..9857489d 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -26,7 +26,7 @@ sub try_mounting {
? ($dir = urpm::sys::trim_until_d($dir))
: urpm::sys::find_mntpoints($dir = reduce_pathname($dir), \%infos);
foreach (grep {
- ! $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount';
+ ! $infos{$_}{mounted};
} @mntpoints)
{
$urpm->{log}(N("mounting %s", $_));
@@ -39,7 +39,7 @@ sub try_mounting {
sys_log("mount $_");
system("mount '$_' 2>/dev/null");
}
- $o_removable && $infos{$_}{fs} ne 'supermount' and $urpm->{removable_mounted}{$_} = undef;
+ $o_removable and $urpm->{removable_mounted}{$_} = undef;
}
-e $dir;
}
@@ -50,7 +50,7 @@ sub try_umounting {
$dir = reduce_pathname($dir);
foreach (reverse grep {
- $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount';
+ $infos{$_}{mounted};
} urpm::sys::find_mntpoints($dir, \%infos))
{
$urpm->{log}(N("unmounting %s", $_));