summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2015-04-06 23:21:00 +0200
committerAnne Nicolas <ennael@mageia.org>2015-04-06 23:21:00 +0200
commiteb3349df71284ad3625af60a56378a1bb5dd120e (patch)
tree40c76670ecf340778ce933ea23b2c2ff117981f7
parentaf07ba8055bf75d5b096b254b175bea01bca6ea9 (diff)
parent978fcd163529573487bd3a0ab607821ee9cf66a6 (diff)
downloaddrakx-eb3349df71284ad3625af60a56378a1bb5dd120e.tar
drakx-eb3349df71284ad3625af60a56378a1bb5dd120e.tar.gz
drakx-eb3349df71284ad3625af60a56378a1bb5dd120e.tar.bz2
drakx-eb3349df71284ad3625af60a56378a1bb5dd120e.tar.xz
drakx-eb3349df71284ad3625af60a56378a1bb5dd120e.zip
Merge branch 'master' of git://git.mageia.org/software/drakx
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/standalone/po/nl.po8
4 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dd331c57d..7cfc637c5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader:
+ o allow btrfs for / without separate /boot with grub2 (mga#15374)
- partitioning wizard:
o do not offer to select RAID as it result in a crash (mga#5800)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index afd4d78ec..425036ba5 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2055,7 +2055,7 @@ sub install {
if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) {
die N("You cannot install the bootloader on a %s partition\n", $part->{fs_type})
- if member($part->{fs_type}, qw(btrfs xfs));
+ if $part->{fs_type} eq 'xfs';
}
$bootloader->{keytable} = keytable($bootloader->{keytable});
action($bootloader, 'install', $all_hds);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 28019289f..2a18978c6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- bootloader:
o add 'noiswmd' to kernel command line to manage isw_ bios
fakeraids with dmraid for now (instead of mdadm)
+ o allow btrfs for / without separate /boot with grub2 (mga#15374)
- partitioning wizard:
o do not offer to select RAID as it result in a crash (mga#5800)
diff --git a/perl-install/standalone/po/nl.po b/perl-install/standalone/po/nl.po
index d8f194c3b..9777fa0b9 100644
--- a/perl-install/standalone/po/nl.po
+++ b/perl-install/standalone/po/nl.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: libDrakX-standalone\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-04-05 21:35+0200\n"
-"PO-Revision-Date: 2015-01-11 16:12+0100\n"
+"PO-Revision-Date: 2015-04-06 20:02+0200\n"
"Last-Translator: Marja van Waes <marja@mageia.org>\n"
"Language-Team: Nederlands <i18n-nl@ml.mageia.org>\n"
"Language: nl\n"
@@ -1615,9 +1615,9 @@ msgid "Formatting encrypted home partition"
msgstr "Formatteren van versleutelde home-partitie"
#: finish-install:264
-#, fuzzy, c-format
+#, c-format
msgid "Finishing install"
-msgstr "Installatieprogramma voor lettertypen"
+msgstr "Installatie voltooien"
#: finish-install:264
#, c-format
@@ -1625,6 +1625,8 @@ msgid ""
"This system will be rebooted\n"
"for the changes to take effect!"
msgstr ""
+"Dit systeem zal herstarten\n"
+"om de veranderingen door te voeren!"
#: harddrake2:30
#, c-format