summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-04 10:44:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-04 10:44:48 +0000
commitb9cbb41ade40d03aa9aa970e5dadb76a816f38e7 (patch)
tree64baf027d4020faaca8b93a1e8d8cb603860fe94
parent35a183477333c12c32fa5457f96f3b4e16d36dfd (diff)
downloaddrakx-b9cbb41ade40d03aa9aa970e5dadb76a816f38e7.tar
drakx-b9cbb41ade40d03aa9aa970e5dadb76a816f38e7.tar.gz
drakx-b9cbb41ade40d03aa9aa970e5dadb76a816f38e7.tar.bz2
drakx-b9cbb41ade40d03aa9aa970e5dadb76a816f38e7.tar.xz
drakx-b9cbb41ade40d03aa9aa970e5dadb76a816f38e7.zip
no_comment
-rw-r--r--Makefile2
-rw-r--r--perl-install/install_steps_auto_install.pm11
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 67a2b4e81..603b25d84 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ ARCH := $(patsubst sparc%,sparc,$(ARCH))
RELEASE_BOOT_IMG = hd.img cdrom.img network.img
ifeq (i386,$(ARCH))
-RELEASE_BOOT_IMG += pcmcia.img
+RELEASE_BOOT_IMG += pcmcia.img blank.img
endif
ifeq (sparc,$(ARCH))
BOOT_IMG = live.img tftp.img tftprd.img live64.img tftp64.img tftprd64.img
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 7b20db611..4b585f7e6 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -3,6 +3,7 @@ package install_steps_auto_install;
use diagnostics;
use strict;
use netconnect;
+use lang;
use vars qw(@ISA);
@ISA = qw(install_steps);
@@ -59,6 +60,16 @@ sub errorInStep {
c::_exit(0);
}
+
+#-######################################################################################
+#- Steps Functions
+#-######################################################################################
+sub selectLanguage {
+ my ($o) = @_;
+ $o->SUPER::selectLanguage;
+ lang::load_console_font($o->{lang});
+}
+
sub exitInstall {
my ($o, $alldone) = @_;
return if $o->{autoExitInstall};