svn commit: r185981 - head/usr.sbin/sysinstall

[Ken Smith]

Author: kensmith
Date: Fri Dec 12 11:43:48 2008
New Revision: 185981
URL: http://svn.freebsd.org/changeset/base/185981

Log:
  Begin the sysinstall cleanup.  Remove the support for configuring OSF
  binary compatibility.

Modified:
  head/usr.sbin/sysinstall/config.c
  head/usr.sbin/sysinstall/install.c
  head/usr.sbin/sysinstall/menus.c
  head/usr.sbin/sysinstall/sysinstall.h

Modified: head/usr.sbin/sysinstall/config.c
==============================================================================
--- head/usr.sbin/sysinstall/config.c	Fri Dec 12 11:10:10 2008	(r185980)
+++ head/usr.sbin/sysinstall/config.c	Fri Dec 12 11:43:48 2008	(r185981)
@@ -548,17 +548,6 @@ configLinux(dialogMenuItem *self)
 }
 #endif
 
-#ifdef __alpha__
-int
-configOSF1(dialogMenuItem *self)
-{
-
-    variable_set2(VAR_OSF1_ENABLE, "YES", 1);
-    Mkdir("/compat/osf1");
-    return DITEM_SUCCESS;
-}
-#endif
-
 int
 configSecurelevel(dialogMenuItem *self)
 {

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Fri Dec 12 11:10:10 2008	(r185980)
+++ head/usr.sbin/sysinstall/install.c	Fri Dec 12 11:43:48 2008	(r185981)
@@ -692,12 +692,6 @@ nodisks:
 	(void)configLinux(self);
 #endif
 
-#ifdef __alpha__
-    dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to enable OSF/1 binary compatibility?"))
-	(void)configOSF1(self);
-#endif
-
 #ifdef WITH_MICE
     dialog_clear_norefresh();
     if (!msgNoYes("Does this system have a PS/2, serial, or bus mouse?"))

Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c	Fri Dec 12 11:10:10 2008	(r185980)
+++ head/usr.sbin/sysinstall/menus.c	Fri Dec 12 11:43:48 2008	(r185981)
@@ -1257,10 +1257,6 @@ DMenu MenuStartup = {
       { " SVR4",	"This host wants to be able to run SVR4 binaries.",
 	dmenuVarCheck, dmenuToggleVariable, NULL, "svr4_enable=YES" },
 #endif
-#ifdef __alpha__
-      { " OSF/1",	"This host wants to be able to run DEC OSF/1 binaries.",
-	dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" },
-#endif
       { " quotas",	"This host wishes to check quotas on startup.",
 	dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" },
       { NULL } },

Modified: head/usr.sbin/sysinstall/sysinstall.h
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.h	Fri Dec 12 11:10:10 2008	(r185980)
+++ head/usr.sbin/sysinstall/sysinstall.h	Fri Dec 12 11:43:48 2008	(r185981)
@@ -169,7 +169,6 @@
 #define VAR_NO_HOME			"noHome"
 #define VAR_NONINTERACTIVE		"nonInteractive"
 #define VAR_NOVELL			"novell"
-#define	VAR_OSF1_ENABLE			"osf1_enable"
 #define	VAR_RPCBIND_ENABLE		"rpcbind_enable"
 #define VAR_NTPDATE_FLAGS		"ntpdate_flags"
 #define VAR_PACKAGE			"package"
@@ -533,9 +532,6 @@ extern int	configSaverTimeout(dialogMenu
 extern int	configLinux(dialogMenuItem *self);
 #endif
 extern int	configNTP(dialogMenuItem *self);
-#ifdef __alpha__
-extern int	configOSF1(dialogMenuItem *self);
-#endif
 extern int	configCountry(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);