summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-05-18 12:50:43 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-05-18 12:50:43 +0000
commitf3ac88e47a1f4a90002e90a83a20504725f022c7 (patch)
tree787820d0bc7519b8af8a65db2c2c3fa6dedb3d59
parent59d93bb7fd0f6e949e2793a0c4b25d3d7639fd01 (diff)
downloaddrakx-f3ac88e47a1f4a90002e90a83a20504725f022c7.tar
drakx-f3ac88e47a1f4a90002e90a83a20504725f022c7.tar.gz
drakx-f3ac88e47a1f4a90002e90a83a20504725f022c7.tar.bz2
drakx-f3ac88e47a1f4a90002e90a83a20504725f022c7.tar.xz
drakx-f3ac88e47a1f4a90002e90a83a20504725f022c7.zip
always set resume= when a swap is available, regardless of its size (#34681)
-rw-r--r--perl-install/any.pm6
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5e11c7aa5..234c74aa7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -174,12 +174,8 @@ sub setupBootloaderBefore {
bootloader::set_append_simple($bootloader, 'noresume');
} elsif (bootloader::get_append_simple($bootloader, 'noresume')) {
} else {
- 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));
- }
+ bootloader::set_append_with_key($bootloader, resume => fs::wild_device::from_part('', $biggest_swap));
}
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2ce5362a2..17ab566c6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- always set resume= when a swap is available, regardless of its size (#34681)
+
Version 13.26 - 17 May 2010
- enable acl by default on ext2/3/4 fs