From 3769edb5f1f083d748437c7367d99a4b86271e88 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 30 Apr 2015 22:26:43 +0200
Subject: skip swap in the list of partitions (mga#15767)

---
 perl-install/NEWS         | 2 ++
 perl-install/any.pm       | 2 +-
 perl-install/install/NEWS | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1