From be1c9ffd9895c8161786eb6e435851918b8d518f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 9 Sep 2008 14:49:46 +0000
Subject: - drop the ability to set mem=xxx in bootloader configuration
 (#42329)

---
 perl-install/NEWS          |  2 ++
 perl-install/any.pm        |  4 ----
 perl-install/bootloader.pm | 20 --------------------
 perl-install/install/NEWS  |  1 +
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 55e27225c..03b4d5633 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
   o keep current UUID when formatting ext2/ext3 (was already done for swap), 
     so that fstab on other distros continue to work (#39913)
     (requires e2fsprogs-1.41.1-2mnb2)
+- drakboot --boot
+  o drop the ability to set mem=xxx
 
 Version 11.38 - 8 September 2008
 
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 8adf030a8..c0005e1e3 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -380,7 +380,6 @@ sub setupBootloader__general {
     my $prev_force_acpi = my $force_acpi = bootloader::get_append_with_key($b, 'acpi') !~ /off|ht/;
     my $prev_enable_apic = my $enable_apic = !bootloader::get_append_simple($b, 'noapic');
     my $prev_enable_lapic = my $enable_lapic = !bootloader::get_append_simple($b, 'nolapic');
-    my $memsize = bootloader::get_append_memsize($b);
     my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
     my $prev_boot = $b->{boot};
     my $prev_method = $b->{method};
@@ -422,8 +421,6 @@ sub setupBootloader__general {
 	      validate => sub { my $ok = !$b->{restricted} || $b->{password} or $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")); $ok } },
 		),
             { text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
-            { label => N("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1,
-	      validate => sub { my $ok = !$memsize || $memsize =~ /^\d+K$/ || $memsize =~ s/^(\d+)M?$/$1M/i or $in->ask_warn('', N("Give the ram size in MB")); $ok } },
         ]) or return 0;
     } else {
 	$b->{boot} = $partition_table::mac::bootstrap_part;	
@@ -455,7 +452,6 @@ sub setupBootloader__general {
 
     bootloader::suggest_message_text($b) if ! -e "$::prefix/boot/message-text"; #- in case we switch from grub to lilo
 
-    bootloader::set_append_memsize($b, $memsize);
     if ($prev_force_acpi != $force_acpi) {
 	bootloader::set_append_with_key($b, acpi => ($force_acpi ? '' : 'ht'));
     }
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f3e52a741..e121c6613 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -765,8 +765,6 @@ sub modify_append {
     }
 }
 
-sub append__mem_is_memsize { $_[0] =~ /^\d+[kM]?$/i }
-
 sub get_append_simple {
     my ($b, $key) = @_;
     my ($simple, $_dict) = unpack_append($b->{perImageAppend});
@@ -813,24 +811,6 @@ sub may_append_with_key {
     set_append_with_key($b, $key, $val) if !get_append_with_key($b, $key);
 }
 
-sub get_append_memsize {
-    my ($b) = @_;
-    my ($_simple, $dict) = unpack_append($b->{perImageAppend});
-    my $e = find { $_->[0] eq 'mem' && append__mem_is_memsize($_->[1]) } @$dict;
-    $e && $e->[1];
-}
-
-sub set_append_memsize {
-    my ($b, $memsize) = @_;
-
-    modify_append($b, sub {
-	my ($_simple, $dict) = @_;
-
-	@$dict = grep { $_->[0] ne 'mem' || !append__mem_is_memsize($_->[1]) } @$dict;
-	push @$dict, [ mem => $memsize ] if $memsize;
-    });
-}
-
 sub get_append_netprofile {
     my ($e) = @_;
     my ($simple, $dict) = unpack_append($e->{append});
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 744f15ddb..469550c84 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
 - keep current UUID when formatting ext2/ext3 (was already done for swap), 
   so that fstab on other distros continue to work (#39913)
   (requires e2fsprogs-1.41.1-2mnb2)
+- drop the ability to set mem=xxx in bootloader configuration
 
 Version 11.38 - 8 September 2008
 
-- 
cgit v1.2.1