summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-04-11 22:33:04 +0000
committerOlivier Blin <blino@mageia.org>2012-04-11 22:33:04 +0000
commita066e879b7ac057b4ebd2f768d69ad9eb7272ed0 (patch)
treef4fec4a634c961813e312dcd4c277818689f5589
parent6e57a1d6245f7a12c683c4460b6684b517b4e458 (diff)
downloaddraklive-install-a066e879b7ac057b4ebd2f768d69ad9eb7272ed0.tar
draklive-install-a066e879b7ac057b4ebd2f768d69ad9eb7272ed0.tar.gz
draklive-install-a066e879b7ac057b4ebd2f768d69ad9eb7272ed0.tar.bz2
draklive-install-a066e879b7ac057b4ebd2f768d69ad9eb7272ed0.tar.xz
draklive-install-a066e879b7ac057b4ebd2f768d69ad9eb7272ed0.zip
fix breakage due to prepare_minimal_root() changes (from tmb)
-rw-r--r--NEWS2
-rwxr-xr-xdraklive-install2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 98d944c..8db5df2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix breakage due to prepare_minimal_root() changes
+
1.35
- replace X-MandrivaLinux-CrossDesktop with X-Mageia-CrossDesktop (mga#2449)
diff --git a/draklive-install b/draklive-install
index e48c6dc..276c672 100755
--- a/draklive-install
+++ b/draklive-install
@@ -200,7 +200,7 @@ sub prepare_root {
my ($in, $all_hds) = @_;
#- create required directories and devices (early to have a consistent root before calling other programs)
my $_wait = $in->wait_message('', N("Please wait"));
- fs::any::prepare_minimal_root($all_hds);
+ fs::any::prepare_minimal_root();
}
sub build_copy_command {
dth: 100.0%;'/> -rw-r--r--rescue/list.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 8198664c1..1e43ef866 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- add efibootmgr on x86_64
+
Version 1.49 - 18 September 2014 by Thomas Backlund
- 80-net-name-slot.rules is replaced with 99-default.link
diff --git a/rescue/list.xml b/rescue/list.xml
index 8d3c2d512..3a846d25a 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -137,7 +137,7 @@
<if ARCH="i.86|x86_64">
grub grub-install
</if>
- <if ARCH="ia64">
+ <if ARCH="x86_64">
efibootmgr
</if>
<if ARCH="ppc">