diff options
| -rw-r--r-- | release/sysinstall/config.c | 15 | ||||
| -rw-r--r-- | release/sysinstall/install.c | 14 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 8 | ||||
| -rw-r--r-- | release/sysinstall/package.c | 4 | ||||
| -rw-r--r-- | release/sysinstall/sysinstall.h | 4 |
5 files changed, 35 insertions, 10 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index d39c48cd4251..35628370d3e2 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.115.2.19 1999/05/15 15:05:23 jkh Exp $ + * $Id: config.c,v 1.115.2.20 1999/05/18 00:49:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -448,6 +448,14 @@ configUsers(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } +int +configLinux(dialogMenuItem *self) +{ + variable_set2(VAR_LINUX_ENABLE, "YES", 1); + msgNotify("Installing Linux compatibility library..."); + return package_add("linux_lib"); +} + static void write_root_xprofile(char *str) { @@ -522,6 +530,11 @@ configXDesktop(dialogMenuItem *self) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment")) write_root_xprofile("xterm &\nexec enlightenment\n"); } + else if (!strcmp(desk, "fvwm")) { + ret = package_add("fvwm"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2")) + write_root_xprofile("xterm &\nexec fvwm2\n"); + } if (DITEM_STATUS(ret) == DITEM_FAILURE) msgConfirm("An error occurred while adding the package(s) required\n" "by this desktop type. Please change installation media\n" diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index d82820b43617..f64ab9778d93 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.223.2.13 1999/05/12 09:04:14 jkh Exp $ + * $Id: install.c,v 1.223.2.14 1999/05/27 10:34:04 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -573,6 +573,12 @@ 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?")) { WINDOW *w = savescr(); @@ -588,21 +594,21 @@ nodisks: if (directory_exists("/usr/X11R6")) { dialog_clear_norefresh(); if (!msgYesNo("Would you like to configure your X server at this time?")) - configXSetup(self); + (void)configXSetup(self); } dialog_clear_norefresh(); if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" "applications, from text editors to games to WEB servers and more. Would you\n" "like to browse the collection now?")) - configPackages(self); + (void)configPackages(self); dialog_clear_norefresh(); if (!msgYesNo("Would you like to add any initial user accounts to the system?\n" "Adding at least one account for yourself at this stage is suggested\n" "since working as the \"root\" user is dangerous (it is easy to do\n" "things which adversely affect the entire system).")) - configUsers(self); + (void)configUsers(self); dialog_clear_norefresh(); msgConfirm("Now you must set the system manager's password.\n" diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 3223190b3e6c..d68c3e5dee98 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.180.2.25 1999/05/21 07:16:55 roberto Exp $ + * $Id: menus.c,v 1.180.2.26 1999/06/09 09:32:19 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -470,6 +470,8 @@ DMenu MenuXDesktops = { NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, { "Enlightenment","The E Window manager (24 bit recommended)", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, + { "fvwm", "The fvwm Window manager", + NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" }, { NULL } }, }; @@ -1236,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, dmenuToggleVariable, NULL, "linux_enable=YES" }, + 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/release/sysinstall/package.c b/release/sysinstall/package.c index 1e4d68e95b12..5d1631db3054 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: package.c,v 1.65.2.10 1999/05/27 10:34:08 jkh Exp $ + * $Id: package.c,v 1.65.2.11 1999/07/02 22:36:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -63,7 +63,7 @@ package_add(char *name) i = index_initialize("packages/INDEX"); if (DITEM_STATUS(i) != DITEM_SUCCESS) return i; - tmp3 = strpbrk(name, "-_") ? NULL : &tmp2; + tmp3 = strpbrk(name, "-") ? NULL : &tmp2; tmp = index_search(&Top, name, tmp3); if (tmp) return index_extract(mediaDevice, &Top, tmp, FALSE); diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index 9446cc3326e6..4c15afafac22 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.153.2.13 1999/05/27 10:34:10 jkh Exp $ + * $Id: sysinstall.h,v 1.153.2.14 1999/07/02 22:36:34 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -122,6 +122,7 @@ #define VAR_KGET "kget" #define VAR_LABEL "label" #define VAR_LABEL_COUNT "labelCount" +#define VAR_LINUX_ENABLE "linux_enable" #define VAR_MEDIA_TYPE "mediaType" #define VAR_MEDIA_TIMEOUT "MEDIA_TIMEOUT" #define VAR_MOUSED "moused_enable" @@ -415,6 +416,7 @@ extern int configResolv(dialogMenuItem *self); extern int configPackages(dialogMenuItem *self); extern int configSaver(dialogMenuItem *self); extern int configSaverTimeout(dialogMenuItem *self); +extern int configLinux(dialogMenuItem *self); extern int configNTP(dialogMenuItem *self); extern int configUsers(dialogMenuItem *self); extern int configXSetup(dialogMenuItem *self); |