Copy all rpms from removable media into the cachedir; don't check for

supermount.

2 files changed, 1 insertions, 25 deletions

diff --git a/urpm.pm b/urpm.pm
index 6b9ac6ee..6f1d5884 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2716,11 +2716,7 @@ sub copy_packages_of_removable_media {
 	    $removables{$device} = [ $sorted_media[-1] ];
 	}
 
-	#- mount the removable device, only one or the important one.
-	#- if supermount is used on the device, it is preferable to copy
-	#- the file instead (because it is so slooooow).
-	$examine_removable_medium->($removables{$device}[0], $device,
-	    urpm::sys::is_using_supermount($device) ? 'copy' : 0);
+	$examine_removable_medium->($removables{$device}[0], $device, 'copy');
     }
 
     1;
diff --git a/urpm/sys.pm b/urpm/sys.pm
index 8a5e0739..3b542eec 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -2,26 +2,6 @@ package urpm::sys;
 
 use strict;
 
-#- check if supermount is used.
-sub is_using_supermount {
-    my ($device_mntpoint) = @_;
-    local $_;
-    #- read /etc/fstab and check for existing mount point.
-    open my $f, "/etc/fstab" or die "Can't read fstab: $!\n";
-    while (<$f>) {
-	next if /^\s*#/;
-	my ($mntpoint, $fstype, $options) = m!^\s*\S+\s+(/\S+)\s+(\S+)\s+(\S+)!
-	    or next;
-	$mntpoint =~ s,/+,/,g; $mntpoint =~ s,/$,,;
-	if ($fstype eq 'supermount') {
-	    return 1 if $device_mntpoint eq $mntpoint;
-	    $options =~ /^(?:.*[\s,])?dev=([^\s,]+)/ && $device_mntpoint eq $1
-		and return 1;
-	}
-    }
-    return 0;
-}
-
 #- find used mount point from a pathname, use a optional mode to allow
 #- filtering according the next operation (mount or umount).
 sub find_mntpoints {