From 8f86fd791d519cff559e406a0cfb12368c240c60 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 2 Jun 2008 17:23:40 +0000 Subject: use UUID for resume= kernel parameter (backport from trunk) --- perl-install/NEWS | 1 + perl-install/any.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 4c8773165..b5048d6de 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,7 @@ o do not allow fbdev if /proc/fb is empty o fix kbluetooth config path o fix autoconfiguration of harddisks +- use UUID for resume= kernel parameter Version 10.29.5 - 20 May 2008 diff --git a/perl-install/any.pm b/perl-install/any.pm index 9f80c7f23..1d50f6a84 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -171,7 +171,7 @@ sub setupBootloaderBefore { 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 => devices::make($biggest_swap->{device})); + bootloader::set_append_with_key($bootloader, resume => fs::wild_device::from_part('', $biggest_swap)); } } } -- cgit v1.2.1