From c7654cf6577657fda7473036aad74146fffa3c51 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 18 Jun 2004 07:59:46 +0000 Subject: in disk-iso install, strip old root from ISOPATH and remove iso file from path if present --- perl-install/install_any.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); -- cgit v1.2.1