From 72cd0db169f952f510435f27b8b37982fdad1948 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Apr 2001 14:27:13 +0000
Subject: (generateAutoInstFloppy): do not use $o->{pcmcia} to know if
 pcmcia.img was used. Better have a look at /proc/cmdline

---
 perl-install/install_steps_interactive.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install')

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/) {
-- 
cgit v1.2.1