diff options
author | kensmith <kensmith@FreeBSD.org> | 2008-12-12 11:43:48 +0000 |
---|---|---|
committer | kensmith <kensmith@FreeBSD.org> | 2008-12-12 11:43:48 +0000 |
commit | c9b65a6863c9f931b75f67e2e6de8b50ab2fdc81 (patch) | |
tree | 503eb6fa16918637e29b8d56bd9341c3404d117b | |
parent | a1eb382b394aea9eebbd5d358da3e5a6502c15d4 (diff) | |
download | FreeBSD-src-c9b65a6863c9f931b75f67e2e6de8b50ab2fdc81.zip FreeBSD-src-c9b65a6863c9f931b75f67e2e6de8b50ab2fdc81.tar.gz |
Begin the sysinstall cleanup. Remove the support for configuring OSF
binary compatibility.
-rw-r--r-- | usr.sbin/sysinstall/config.c | 11 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 4 |
4 files changed, 0 insertions, 25 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index e550f05..2275bc6 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -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) { diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 5782da6..f70e5a1 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -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?")) diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 45ac4af..6a22d32 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -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 } }, diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 2bc366d..ae1f2d8 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -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(dialogMenuItem *self); 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); |