From 152a27509be065247963de458a032c867322b428 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 6 Jul 1999 09:19:36 +0000 Subject: [PATCH] Don't ask about Linux emulation on the alpha (for now). --- release/sysinstall/install.c | 4 +++- release/sysinstall/menus.c | 4 +++- usr.sbin/sade/install.c | 4 +++- usr.sbin/sade/menus.c | 4 +++- usr.sbin/sysinstall/install.c | 4 +++- usr.sbin/sysinstall/menus.c | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index b1bbaa019eb..2ba3aa8d093 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.238 1999/06/17 19:04:53 markm Exp $ + * $Id: install.c,v 1.239 1999/07/06 08:45:36 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -573,9 +573,11 @@ nodisks: restorescr(w); } +#ifdef __i386__ dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); +#endif dialog_clear_norefresh(); if (!msgYesNo("Does this system have a mouse attached to it?")) { diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 37cc699c24f..db7c4bdca9d 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.208 1999/06/23 03:52:10 jkh Exp $ + * $Id: menus.c,v 1.209 1999/07/06 08:45:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1238,8 +1238,10 @@ DMenu MenuStartup = { dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, { "lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, +#ifdef __i386__ { "linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, +#endif { "quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { "SCO", "This host wants to be able to run IBCS2 binaries.", diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index b1bbaa019eb..2ba3aa8d093 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.238 1999/06/17 19:04:53 markm Exp $ + * $Id: install.c,v 1.239 1999/07/06 08:45:36 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -573,9 +573,11 @@ nodisks: restorescr(w); } +#ifdef __i386__ dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); +#endif dialog_clear_norefresh(); if (!msgYesNo("Does this system have a mouse attached to it?")) { diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 37cc699c24f..db7c4bdca9d 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.208 1999/06/23 03:52:10 jkh Exp $ + * $Id: menus.c,v 1.209 1999/07/06 08:45:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1238,8 +1238,10 @@ DMenu MenuStartup = { dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, { "lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, +#ifdef __i386__ { "linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, +#endif { "quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { "SCO", "This host wants to be able to run IBCS2 binaries.", diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index b1bbaa019eb..2ba3aa8d093 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.238 1999/06/17 19:04:53 markm Exp $ + * $Id: install.c,v 1.239 1999/07/06 08:45:36 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -573,9 +573,11 @@ nodisks: restorescr(w); } +#ifdef __i386__ dialog_clear_norefresh(); if (!msgYesNo("Would you like to enable Linux binary compatibility?")) (void)configLinux(self); +#endif dialog_clear_norefresh(); if (!msgYesNo("Does this system have a mouse attached to it?")) { diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 37cc699c24f..db7c4bdca9d 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.208 1999/06/23 03:52:10 jkh Exp $ + * $Id: menus.c,v 1.209 1999/07/06 08:45:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1238,8 +1238,10 @@ DMenu MenuStartup = { dmenuVarCheck, dmenuToggleVariable, NULL, "accounting_enable=YES" }, { "lpd", "This host has a printer and wants to run lpd.", dmenuVarCheck, dmenuToggleVariable, NULL, "lpd_enable=YES" }, +#ifdef __i386__ { "linux", "This host wants to be able to run linux binaries.", dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" }, +#endif { "quotas", "This host wishes to check quotas on startup.", dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { "SCO", "This host wants to be able to run IBCS2 binaries.",