From fee8276318fa6485c0fe4e3a1016a85741b444e1 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Wed, 18 Feb 2004 10:18:33 +0000 Subject: allow using ext2 or vfat floppies for kickstart=floppy so that when you do an auto install based on network.img and network_drivers.img, you can put your auto_inst.cfg.pl on network_drivers.img and rock n roll --- perl-install/install_any.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2b49f4df2..36942fa6b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -834,7 +834,12 @@ sub loadO { if ($f =~ /^(floppy|patch)$/) { my $f = $f eq "floppy" ? 'auto_inst.cfg' : "patch"; unless ($::testing) { - fs::mount(devices::make(detect_devices::floppy()), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly'); + my $dev = devices::make(detect_devices::floppy()); + foreach my $fs (arch() =~ /sparc/ ? 'romfs' : ('ext2', 'vfat')) { + eval { fs::mount($dev, '/mnt', $fs, 'readonly'); 1 } and goto mount_ok; + } + die "Couldn't mount floppy [$dev]"; + mount_ok: $f = "/mnt/$f"; } -e $f or $f .= '.pl'; -- cgit v1.2.1