mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00
Code Issues Releases Activity

o Compile-out "wizard" mode on ia64.

Browse Source 
o  Do not set bootblocks on ia64. It's not even a functionality in
   libdisk on ia64.
This commit is contained in:
Marcel Moolenaar 2003-11-01 20:04:12 +00:00
parent b34553a3ab
commit fb8ce55cf5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121863
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sade/disks.c
View File

@ -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

6
usr.sbin/sysinstall/disks.c
View File

@ -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