summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2003-11-01 20:04:12 +0000
committermarcel <marcel@FreeBSD.org>2003-11-01 20:04:12 +0000
commit854157714e80e85a7a547409638dbf5c15a5f15b (patch)
tree9c3d964bf5bb66da2651f4aeb9693a757bffe585 /usr.sbin/sysinstall
parentd6171b5a7b2fc0c6699bdde44d1b068e2664d310 (diff)
downloadFreeBSD-src-854157714e80e85a7a547409638dbf5c15a5f15b.zip
FreeBSD-src-854157714e80e85a7a547409638dbf5c15a5f15b.tar.gz
o Compile-out "wizard" mode on ia64.
o Do not set bootblocks on ia64. It's not even a functionality in libdisk on ia64.
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/disks.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index b665bc5..4fba2c7 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
OpenPOWER on IntegriCloud