From fb8ce55cf5982e1bb3b0bc8b924117c753cf7321 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sat, 1 Nov 2003 20:04:12 +0000 Subject: [PATCH] o Compile-out "wizard" mode on ia64. o Do not set bootblocks on ia64. It's not even a functionality in libdisk on ia64. --- usr.sbin/sade/disks.c | 6 ++++-- usr.sbin/sysinstall/disks.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index b665bc5b830..4fba2c7df83 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -622,6 +622,7 @@ diskPartition(Device *dev) clear(); break; +#ifndef __ia64__ case '|': if (!msgNoYes("Are you SURE you want to go into Wizard mode?\n" "No seat belts whatsoever are provided!")) { @@ -635,6 +636,7 @@ diskPartition(Device *dev) msg = "Wise choice!"; clear(); break; +#endif case '\033': /* ESC */ case 'Q': @@ -858,11 +860,11 @@ diskPartitionWrite(dialogMenuItem *self) if (!devs[i]->enabled) continue; -#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) +#if defined(__i386__) || defined(__amd64__) if (!boot1) boot1 = bootalloc("boot1", NULL); if (!boot2) boot2 = bootalloc("boot2", NULL); Set_Boot_Blocks(d, boot1, boot2); -#else +#elif !defined(__ia64__) if (!boot1) boot1 = bootalloc("boot1", NULL); Set_Boot_Blocks(d, boot1, NULL); #endif diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index b665bc5b830..4fba2c7df83 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -622,6 +622,7 @@ diskPartition(Device *dev) clear(); break; +#ifndef __ia64__ case '|': if (!msgNoYes("Are you SURE you want to go into Wizard mode?\n" "No seat belts whatsoever are provided!")) { @@ -635,6 +636,7 @@ diskPartition(Device *dev) msg = "Wise choice!"; clear(); break; +#endif case '\033': /* ESC */ case 'Q': @@ -858,11 +860,11 @@ diskPartitionWrite(dialogMenuItem *self) if (!devs[i]->enabled) continue; -#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) +#if defined(__i386__) || defined(__amd64__) if (!boot1) boot1 = bootalloc("boot1", NULL); if (!boot2) boot2 = bootalloc("boot2", NULL); Set_Boot_Blocks(d, boot1, boot2); -#else +#elif !defined(__ia64__) if (!boot1) boot1 = bootalloc("boot1", NULL); Set_Boot_Blocks(d, boot1, NULL); #endif