summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-05-28 11:13:22 +0200
committerThomas Backlund <tmb@mageia.org>2015-05-28 11:13:22 +0200
commit7c9bf2ce385a91158f3fabcb521ca8b5f4575110 (patch)
tree94e5215f757b56ad6e70d880c8929866c7604d42
parent62645b8ddc107a13151f2a30297aefda4c16f790 (diff)
downloaddrakx-7c9bf2ce385a91158f3fabcb521ca8b5f4575110.tar
drakx-7c9bf2ce385a91158f3fabcb521ca8b5f4575110.tar.gz
drakx-7c9bf2ce385a91158f3fabcb521ca8b5f4575110.tar.bz2
drakx-7c9bf2ce385a91158f3fabcb521ca8b5f4575110.tar.xz
drakx-7c9bf2ce385a91158f3fabcb521ca8b5f4575110.zip
fix last commit (spotted by tv), update intaller NEWS too
-rw-r--r--perl-install/fs/type.pm2
-rw-r--r--perl-install/install/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index c4dc8387b..b20620a23 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -308,7 +308,7 @@ sub isRecovery {
member($_[0]{device_LABEL} ,
# Extracted from /usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
# Hopefuly we'll ask to hal/udev someday
- 'RECOVERY', 'PQSERVICE', 'HP_RECOVERY', 'Lenovo_Recovery', 'SYSTEM_DRV', 'Recovery Partition', 'DellUtility', 'DellRestore', 'IBM_SERVICE', 'SERVICEV001', 'SERVICEV002' 'Packard_Bell', 'Push_Button_Reset')
+ 'RECOVERY', 'PQSERVICE', 'HP_RECOVERY', 'Lenovo_Recovery', 'SYSTEM_DRV', 'Recovery Partition', 'DellUtility', 'DellRestore', 'IBM_SERVICE', 'SERVICEV001', 'SERVICEV002', 'Packard_Bell', 'Push_Button_Reset')
);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 38ca15db5..96ff4ad4d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o ignore special 'Packard_Bell' and 'Push_Button_Reset' partitions (mga#15999)
+
Version 16.101 - 25 May 2015
- do not die if network cannot be started for updates (mga#8819),