summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-30 22:26:43 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-01-02 14:53:40 +0100
commit3769edb5f1f083d748437c7367d99a4b86271e88 (patch)
treeb79beac373c6dc669a466490b38a2ba8ebc3362f
parent70e92f4e81a2f48c875a7d5ffa1e374ab10ac41a (diff)
downloaddrakx-3769edb5f1f083d748437c7367d99a4b86271e88.tar
drakx-3769edb5f1f083d748437c7367d99a4b86271e88.tar.gz
drakx-3769edb5f1f083d748437c7367d99a4b86271e88.tar.bz2
drakx-3769edb5f1f083d748437c7367d99a4b86271e88.tar.xz
drakx-3769edb5f1f083d748437c7367d99a4b86271e88.zip
skip swap in the list of partitions (mga#15767)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a39a3a42a..42a193ef8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
- misc cleanups
+- drakboot:
+ o skip swap in the list of partitions (mga#15767)
Version 17.8 - 22 December 2015
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3bd13fceb..fe9ec1db9 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -496,7 +496,7 @@ sub setupBootloader__entries {
if ($e->{type} eq "image") {
@l = (
{ label => N("Image"), val => \$e->{kernel_or_dev}, list => [ map { "/boot/$_" } bootloader::installed_vmlinuz() ], not_edit => 0 },
-{ label => N("Root"), val => \$e->{root}, list => [ map { fs::wild_device::from_part('', $_) } @$fstab ], format => sub { $root_descr{$_[0]} } },
+{ label => N("Root"), val => \$e->{root}, list => [ map { fs::wild_device::from_part('', $_) } grep { !isSwap($_) } @$fstab ], format => sub { $root_descr{$_[0]} } },
{ label => N("Append"), val => \$append },
if_($e->{xen},
{ label => N("Xen append"), val => \$e->{xen_append} }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9305cb64f..147a58a6d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o skip swap in the list of partitions (mga#15767)
- misc cleanups
Version 17.11 - 1 January 2016