From e1a70a955d9866e10a5ce5e4e3bf655e81d18d18 Mon Sep 17 00:00:00 2001 From: Antoine Ginies Date: Tue, 8 Mar 2011 15:33:15 +0000 Subject: remove resume option --- perl-install/any.pm | 5 +++-- perl-install/bootloader.pm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index fc63191a9..1d33e8bbc 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -177,8 +177,9 @@ sub setupBootloaderBefore { my ($MemTotal) = cat_("/proc/meminfo") =~ /^MemTotal:\s*(\d+)/m; if (my ($biggest_swap) = sort { $b->{size} <=> $a->{size} } grep { isSwap($_) } @$fstab) { log::l("MemTotal: $MemTotal < ", $biggest_swap->{size} / 2); - if ($MemTotal < $biggest_swap->{size} / 2) { - bootloader::set_append_with_key($bootloader, resume => fs::wild_device::from_part('', $biggest_swap)); + log::l("I dont want the resume option"); +# if ($MemTotal < $biggest_swap->{size} / 2) { +# bootloader::set_append_with_key($bootloader, resume => fs::wild_device::from_part('', $biggest_swap)); } } } diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 60d4c1987..b7ad87ac9 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -756,7 +756,7 @@ sub duplicate_kernel_entry { add_entry($bootloader, $entry); } -my $uniq_dict_appends = join('|', qw(acpi pci resume PROFILE XFree)); +my $uniq_dict_appends = join('|', qw(acpi pci PROFILE XFree)); sub unpack_append { my ($s) = @_; -- cgit v1.2.1