summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-21 07:28:16 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-21 07:28:16 +0000
commit04cdfc93220a8deb595dccda794fa34ae5c77f36 (patch)
tree12034ce2d30a96508fe48452fe377c432b8b358e /urpm
parent73cb41dad6924966006c0b00360c1d4f3221acbe (diff)
downloadurpmi-04cdfc93220a8deb595dccda794fa34ae5c77f36.tar
urpmi-04cdfc93220a8deb595dccda794fa34ae5c77f36.tar.gz
urpmi-04cdfc93220a8deb595dccda794fa34ae5c77f36.tar.bz2
urpmi-04cdfc93220a8deb595dccda794fa34ae5c77f36.tar.xz
urpmi-04cdfc93220a8deb595dccda794fa34ae5c77f36.zip
simplify, let mount finds the loop device
Diffstat (limited to 'urpm')
-rw-r--r--urpm/removable.pm4
-rw-r--r--urpm/sys.pm17
2 files changed, 1 insertions, 20 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 7da3d687..ced637bb 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -85,10 +85,8 @@ sub _try_mounting_iso {
if ($mntpoint) {
$urpm->{log}(N("mounting %s", $mntpoint));
- #- to mount an iso image, grab the first loop device
- my $loopdev = urpm::sys::first_free_loopdev();
sys_log("mount iso $mntpoint on $iso");
- $loopdev and system('mount', $iso, $mntpoint, '-t', 'iso9660', '-o', "loop=$loopdev");
+ system('mount', $iso, $mntpoint, '-t', 'iso9660', '-o', 'loop');
$urpm->{removable_mounted}{$mntpoint} = undef;
}
-e $mntpoint;
diff --git a/urpm/sys.pm b/urpm/sys.pm
index c056af73..bfe0e719 100644
--- a/urpm/sys.pm
+++ b/urpm/sys.pm
@@ -162,23 +162,6 @@ sub proc_mounts() {
@l;
}
-
-=item first_free_loopdev()
-
-Returns the first unused loop device, or an empty string if none is found.
-
-=cut
-
-sub first_free_loopdev () {
- my %loopdevs = map { $_ => 1 } grep { ! -d $_ } glob('/dev/loop*');
- foreach (proc_mounts()) {
- (our $dev) = split ' ';
- delete $loopdevs{$dev} if $dev =~ m!^/dev/loop!;
- }
- my @l = keys %loopdevs;
- @l ? $l[0] : '';
-}
-
sub trim_until_d {
my ($dir) = @_;
foreach (proc_mounts()) {