diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-06-18 07:59:46 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-06-18 07:59:46 +0000 |
| commit | c7654cf6577657fda7473036aad74146fffa3c51 (patch) | |
| tree | a08f6af0f2882d6e543a789509b45a773f69e965 /perl-install | |
| parent | 9a768e7b5f9ab5879bf3c8f5be3d1267156d5a94 (diff) | |
| download | drakx-c7654cf6577657fda7473036aad74146fffa3c51.tar drakx-c7654cf6577657fda7473036aad74146fffa3c51.tar.gz drakx-c7654cf6577657fda7473036aad74146fffa3c51.tar.bz2 drakx-c7654cf6577657fda7473036aad74146fffa3c51.tar.xz drakx-c7654cf6577657fda7473036aad74146fffa3c51.zip | |
in disk-iso install, strip old root from ISOPATH and remove iso file from path if present
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index c9d122d6e..f64da8589 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -89,7 +89,11 @@ sub look_for_ISOs() { sysopen(my $F, $iso_images{loopdev}, 0) or return; put_in_hash(\%iso_images, $get_iso_ids->($F)); - foreach my $iso_file (glob("$ENV{ISOPATH}/*.iso")) { + my $iso_dir = $ENV{ISOPATH}; + #- strip old root and remove iso file from path if present + $iso_dir =~ s!^/sysroot!!; $iso_dir =~ s![^/]*.iso$!!; + + foreach my $iso_file (glob("$iso_dir/*.iso")) { my $iso_dev = devices::set_loop($iso_file) or return; if (sysopen($F, $iso_dev, 0)) { my $iso_ids = $get_iso_ids->($F); |