summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-02-18 10:18:33 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-02-18 10:18:33 +0000
commitfee8276318fa6485c0fe4e3a1016a85741b444e1 (patch)
treeb332e31c4a501303aea3662c6535128463fed8a5
parent04e6b93752bbf279193dce8251ad2ecca24fa7a6 (diff)
downloaddrakx-fee8276318fa6485c0fe4e3a1016a85741b444e1.tar
drakx-fee8276318fa6485c0fe4e3a1016a85741b444e1.tar.gz
drakx-fee8276318fa6485c0fe4e3a1016a85741b444e1.tar.bz2
drakx-fee8276318fa6485c0fe4e3a1016a85741b444e1.tar.xz
drakx-fee8276318fa6485c0fe4e3a1016a85741b444e1.zip
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
-rw-r--r--perl-install/install_any.pm7
1 files changed, 6 insertions, 1 deletions
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';