diff options
author | kensmith <kensmith@FreeBSD.org> | 2008-12-12 11:58:27 +0000 |
---|---|---|
committer | kensmith <kensmith@FreeBSD.org> | 2008-12-12 11:58:27 +0000 |
commit | 9aa6bcff62ea1bb898209f15836407394f2fffcf (patch) | |
tree | 3199709c85dd5969e3502498b25011d22ccd7d2d /usr.sbin/sysinstall | |
parent | c9b65a6863c9f931b75f67e2e6de8b50ab2fdc81 (diff) | |
download | FreeBSD-src-9aa6bcff62ea1bb898209f15836407394f2fffcf.zip FreeBSD-src-9aa6bcff62ea1bb898209f15836407394f2fffcf.tar.gz |
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...
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r-- | usr.sbin/sysinstall/config.c | 17 | ||||
-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, 31 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 2275bc6..89bf247 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -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) { diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index f70e5a1..69d9456 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -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?")) diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 6a22d32..a600da1 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -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" }, diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index ae1f2d8..107a2ac 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -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 */ |