From 767df892d745f6bda78a0f2d2a7d2b409b0c07a9 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Wed, 30 Sep 1998 21:58:36 +0000 Subject: [PATCH] One last alpha seat belt - never ask for an MBR boot manager. --- release/sysinstall/disks.c | 4 +++- usr.sbin/sade/disks.c | 4 +++- usr.sbin/sysinstall/disks.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 9222a39aaa2e..4d4703d77d15 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ + * $Id: disks.c,v 1.102 1998/09/30 21:55:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -140,6 +140,7 @@ getBootMgr(char *dname) char *cp; int i = 0; +#ifndef __alpha__ /* only meaningful on x86 */ cp = variable_get(VAR_BOOTMGR); if (!cp) { /* Figure out what kind of MBR the user wants */ @@ -168,6 +169,7 @@ getBootMgr(char *dname) break; } } +#endif return NULL; } diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 9222a39aaa2e..4d4703d77d15 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ + * $Id: disks.c,v 1.102 1998/09/30 21:55:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -140,6 +140,7 @@ getBootMgr(char *dname) char *cp; int i = 0; +#ifndef __alpha__ /* only meaningful on x86 */ cp = variable_get(VAR_BOOTMGR); if (!cp) { /* Figure out what kind of MBR the user wants */ @@ -168,6 +169,7 @@ getBootMgr(char *dname) break; } } +#endif return NULL; } diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 9222a39aaa2e..4d4703d77d15 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.101 1998/09/30 21:48:11 jkh Exp $ + * $Id: disks.c,v 1.102 1998/09/30 21:55:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -140,6 +140,7 @@ getBootMgr(char *dname) char *cp; int i = 0; +#ifndef __alpha__ /* only meaningful on x86 */ cp = variable_get(VAR_BOOTMGR); if (!cp) { /* Figure out what kind of MBR the user wants */ @@ -168,6 +169,7 @@ getBootMgr(char *dname) break; } } +#endif return NULL; }