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

[Ken Smith]

Author: kensmith
Date: Fri Dec 12 11:58:27 2008
New Revision: 185982
URL: http://svn.freebsd.org/changeset/base/185982

Log:
  Remove the offer to install Linux compatibility on i386 in the mainline
  portion of sysinstall.  Leave it to be treated as a regular package
  along with all the other packages...

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:43:48 2008	(r185981)
+++ head/usr.sbin/sysinstall/config.c	Fri Dec 12 11:58:27 2008	(r185982)
@@ -531,23 +531,6 @@ configUsers(dialogMenuItem *self)
     return DITEM_SUCCESS;
 }
 
-#ifdef WITH_LINUX
-int
-configLinux(dialogMenuItem *self)
-{
-    WINDOW *w = savescr();
-    int i;
-
-    dialog_clear_norefresh();
-    variable_set2(VAR_LINUX_ENABLE, "YES", 1);
-    Mkdir("/compat/linux");
-    msgNotify("Installing Linux compatibility library...");
-    i = package_add("linux_base-fc");
-    restorescr(w);
-    return i;
-}
-#endif
-
 int
 configSecurelevel(dialogMenuItem *self)
 {

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Fri Dec 12 11:43:48 2008	(r185981)
+++ head/usr.sbin/sysinstall/install.c	Fri Dec 12 11:58:27 2008	(r185982)
@@ -686,12 +686,6 @@ nodisks:
     if (!msgYesNo("Would you like to set this machine's time zone now?"))
 	systemExecute("tzsetup");
 
-#ifdef WITH_LINUX
-    dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to enable Linux binary compatibility?"))
-	(void)configLinux(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:43:48 2008	(r185981)
+++ head/usr.sbin/sysinstall/menus.c	Fri Dec 12 11:58:27 2008	(r185982)
@@ -1247,10 +1247,6 @@ 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 WITH_LINUX
-      { " Linux",	"This host wants to be able to run Linux binaries.",
-	dmenuVarCheck, configLinux, NULL, VAR_LINUX_ENABLE "=YES" },
-#endif
 #ifdef __i386__
       { " SCO",		"This host wants to be able to run IBCS2 binaries.",
 	dmenuVarCheck, dmenuToggleVariable, NULL, "ibcs2_enable=YES" },

Modified: head/usr.sbin/sysinstall/sysinstall.h
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.h	Fri Dec 12 11:43:48 2008	(r185981)
+++ head/usr.sbin/sysinstall/sysinstall.h	Fri Dec 12 11:58:27 2008	(r185982)
@@ -61,10 +61,6 @@
 #define	WITH_SLICES
 #endif
 
-#if defined(__i386__)
-#define	WITH_LINUX
-#endif
-
 /* device limits */
 #define DEV_NAME_MAX		128	/* The maximum length of a device name	*/
 #define DEV_MAX			100	/* The maximum number of devices we'll deal with */