summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-05 14:27:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-05 14:27:13 +0000
commit72cd0db169f952f510435f27b8b37982fdad1948 (patch)
tree4e41476b6ee5649763c0b34b773a0887335ca508 /perl-install/install_steps_interactive.pm
parentc2dbf3d465da98b7d9eadb78a682798051666762 (diff)
downloaddrakx-72cd0db169f952f510435f27b8b37982fdad1948.tar
drakx-72cd0db169f952f510435f27b8b37982fdad1948.tar.gz
drakx-72cd0db169f952f510435f27b8b37982fdad1948.tar.bz2
drakx-72cd0db169f952f510435f27b8b37982fdad1948.tar.xz
drakx-72cd0db169f952f510435f27b8b37982fdad1948.zip
(generateAutoInstFloppy): do not use $o->{pcmcia} to know if pcmcia.img
was used. Better have a look at /proc/cmdline
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 34d9d943c..41de68d6d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1067,7 +1067,7 @@ sub generateAutoInstFloppy {
my $dev = devices::make($floppy);
- my $image = $o->{pcmcia} ? "pcmcia" :
+ my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" :
${{ hd => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}};
if (arch() =~ /sparc/) {