diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-06-02 17:23:40 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-06-02 17:23:40 +0000 |
| commit | 8f86fd791d519cff559e406a0cfb12368c240c60 (patch) | |
| tree | 3d80985f23f60a3372b2fbd207b8a7985984dfdd | |
| parent | 41a4cedee42011808156c59484267bf184e19a4c (diff) | |
| download | drakx-backup-do-not-use-8f86fd791d519cff559e406a0cfb12368c240c60.tar drakx-backup-do-not-use-8f86fd791d519cff559e406a0cfb12368c240c60.tar.gz drakx-backup-do-not-use-8f86fd791d519cff559e406a0cfb12368c240c60.tar.bz2 drakx-backup-do-not-use-8f86fd791d519cff559e406a0cfb12368c240c60.tar.xz drakx-backup-do-not-use-8f86fd791d519cff559e406a0cfb12368c240c60.zip | |
use UUID for resume= kernel parameter (backport from trunk)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 |
2 files changed, 2 insertions, 1 deletions
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)); } } } |