summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-10-02 12:20:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-10-02 12:20:46 +0000
commit8dae955d6c76f66df700d50676a142610175bef8 (patch)
tree17f4ae078d870923fea1a2a5335cdd806e90f675
parent5f0786356a985b38016f85b19527e1969146deb6 (diff)
downloaddrakx-8dae955d6c76f66df700d50676a142610175bef8.tar
drakx-8dae955d6c76f66df700d50676a142610175bef8.tar.gz
drakx-8dae955d6c76f66df700d50676a142610175bef8.tar.bz2
drakx-8dae955d6c76f66df700d50676a142610175bef8.tar.xz
drakx-8dae955d6c76f66df700d50676a142610175bef8.zip
no_comment
-rw-r--r--docs/mdk-vs-redhat2
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/bootloader.pm1
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm11
5 files changed, 14 insertions, 7 deletions
diff --git a/docs/mdk-vs-redhat b/docs/mdk-vs-redhat
index 5d650fcf2..88e59a2e8 100644
--- a/docs/mdk-vs-redhat
+++ b/docs/mdk-vs-redhat
@@ -22,4 +22,4 @@
- no LABEL= in fstab (for auto renumbering of devices)
- kerberos
--
+- LDAP
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 65eb740c3..79318562c 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -4,6 +4,11 @@
2000-10-02 Pixel <pixel@mandrakesoft.com>
+ * bootloader.pm (install_lilo): change the default color of menu
+
+ * install_steps_interactive.pm (choosePackages): add 300MB choice
+ in desktop
+
* mouse.pm (fullnames): fix i18n fix
* install_steps.pm (miscellaneous): don't add ide2=0x... for
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ae0a20fa6..694b06d60 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -439,6 +439,7 @@ sub install_lilo($$) {
#- print F "password=", $lilo->{password} if $lilo->{restricted} && $lilo->{password}; #- done by msec
print F "timeout=", round(10 * $lilo->{timeout}) if $lilo->{timeout};
print F "message=/boot/message" if $lilo->{message};
+ print F "menu-scheme=wb:bw:wb:bw";
foreach (@{$lilo->{entries}}) {
print F "$_->{type}=$_->{kernel_or_dev}";
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5e6340f3f..f78961b30 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -507,7 +507,7 @@ sub main {
kickstart => sub { $::auto_install = $v },
auto_install => sub { $::auto_install = $v },
simple_themes => sub { $o->{simple_themes} = 1 },
- useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
+#- useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
fdisk => sub { $o->{partitioning}{fdisk} = 1 },
g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 546d19fbb..73fbedd2e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -475,15 +475,16 @@ sub choosePackages {
my $max = round_up(min($max_size, $availableC) / sqr(1024), 100);
if ($::beginner) {
- my (@l, @text);
+ my (@l);
+ my @text = (__("Minimum (%dMB)"), __("Recommended (%dMB)"), __("Complete (%dMB)"));
if ($o->{meta_class} eq 'desktop') {
- @l = (500, 800, 0);
- @text = (__("Minimum (%dMB)"), __("Complete (%dMB)"), __("Custom"));
- $max > $l[1] or splice(@l, 1, 1), splice(@text, 1, 1);
+ @l = (300, 500, 800, 0);
+ $max > $l[2] or splice(@l, 2, 1);
+ $max > $l[1] or splice(@l, 1, 1);
$max > $l[0] or @l = $max;
+ $text[$#l] = __("Custom");
} else {
@l = (300, 700, $max);
- @text = (__("Minimum (%dMB)"), __("Recommended (%dMB)"), __("Complete (%dMB)"));
$l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff
$l[1] > $l[0] + 100 or splice(@l, 0, 1);
}