summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwan Velu <erwan@mandriva.org>2003-02-26 11:23:11 +0000
committerErwan Velu <erwan@mandriva.org>2003-02-26 11:23:11 +0000
commitb090bb15df2ec04681178ca9131b9c646fdffd05 (patch)
treedf5020d49cd2cc36a55a1468eeb8d20ade8517f5
parent7300b62c321683b38847e5a3f886baac3223f6b0 (diff)
downloaddrakx-backup-do-not-use-b090bb15df2ec04681178ca9131b9c646fdffd05.tar
drakx-backup-do-not-use-b090bb15df2ec04681178ca9131b9c646fdffd05.tar.gz
drakx-backup-do-not-use-b090bb15df2ec04681178ca9131b9c646fdffd05.tar.bz2
drakx-backup-do-not-use-b090bb15df2ec04681178ca9131b9c646fdffd05.tar.xz
drakx-backup-do-not-use-b090bb15df2ec04681178ca9131b9c646fdffd05.zip
merging ia64
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/steps.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 4c2c43316..e68ea6e33 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -38,7 +38,7 @@ use fs;
);
foreach (values %suggestions) {
if (arch() =~ /ia64/) {
- @$_ = ({ mntpoint => "/boot/efi", size => 50 << 11, type => 0xb, ratio => 1, maxsize => 150 << 11 }, @$_);
+ @$_ = ({ mntpoint => "/boot/efi", size => 50 << 11, type => 0xef, ratio => 1, maxsize => 150 << 11 }, @$_);
}
}
diff --git a/perl-install/steps.pm b/perl-install/steps.pm
index 162bc6d57..d62e8ddf5 100644
--- a/perl-install/steps.pm
+++ b/perl-install/steps.pm
@@ -27,7 +27,7 @@ use common;
summary => [ __("Summary"), 1, 0, '', "installPackages", 'summary' ],
configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ],
setupBootloader => [ __("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ],
-if_((arch() !~ /alpha/) && (arch() !~ /ppc/),
+if_((arch() !~ /alpha/) && (arch() !~ /ppc/) && (arch() !~ /ia64/),
createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ],
),
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ],