diff options
author | jkh <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
commit | 2f046ead7857172f2e15013c7430ce094707232b (patch) | |
tree | 71e297facf3fd13d5d8de04b5b5937fc87d3020b /release | |
parent | ab91f06287e9a0c28b4319993377ac5b9e6208a3 (diff) | |
download | FreeBSD-src-2f046ead7857172f2e15013c7430ce094707232b.zip FreeBSD-src-2f046ead7857172f2e15013c7430ce094707232b.tar.gz |
Another round of updates for -current and 3.2
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/config.c | 10 | ||||
-rw-r--r-- | release/sysinstall/dist.c | 4 | ||||
-rw-r--r-- | release/sysinstall/install.c | 4 | ||||
-rw-r--r-- | release/sysinstall/kget.c | 11 | ||||
-rw-r--r-- | release/sysinstall/menus.c | 8 |
5 files changed, 23 insertions, 14 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 52e90f2..b2f0f6f 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.127 1999/04/28 06:39:25 jkh Exp $ + * $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -558,8 +558,12 @@ tryagain: "utility."); dialog_clear(); systemExecute(execfile); - if (!file_readable("/etc/XF86Config") && !msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) - goto tryagain; + if (!file_readable("/etc/XF86Config")) { + if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) + goto tryagain; + else + return DITEM_FAILURE | DITEM_RESTORE; + } configXDesktop(self); return DITEM_SUCCESS | DITEM_RESTORE; } diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index dae0240..5c66318 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.137 1999/03/19 10:54:37 jkh Exp $ + * $Id: dist.c,v 1.138 1999/04/21 07:22:37 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -202,8 +202,6 @@ distVerifyFlags(void) XF86Dists |= DIST_XF86_FONTS; if (XF86Dists || XF86ServerDists || XF86FontDists) Dists |= DIST_XF86; - if (Dists & DIST_XF86) - Dists |= DIST_COMPAT22; if (isDebug()) msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n", Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists); diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 703a760..9746457 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.232 1999/04/27 14:33:25 jkh Exp $ + * $Id: install.c,v 1.233 1999/04/28 10:51:01 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -751,7 +751,7 @@ installFixupBin(dialogMenuItem *self) msgConfirm("Kernel copied OK, but unable to save boot -c changes\n" "to it. See the debug screen (ALT-F2) for details."); } - else { + else if (file_readable("/boot/kernel.conf")) { FILE *fp; if ((fp = fopen("/boot/loader.conf", "a")) != NULL) { diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c index 2520480..284683a 100644 --- a/release/sysinstall/kget.c +++ b/release/sysinstall/kget.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kget.c,v 1.4 1999/03/10 02:50:31 jkh Exp $ + * $Id: kget.c,v 1.5 1999/05/05 10:14:06 jkh Exp $ */ #include "sysinstall.h" @@ -34,7 +34,7 @@ int kget(char *out) { - int len, i, bytes_written; + int len, i, bytes_written = 0; char *buf; char *mib1 = "machdep.uc_devlist"; char *mib2 = "machdep.uc_pnplist"; @@ -53,7 +53,7 @@ kget(char *out) } if (len <= 0) { msgDebug("kget: mib1 has length of %d\n", len); - return -1; + goto pnp; } buf = (char *)alloca(len * sizeof(char)); i = sysctlbyname(mib1, buf, &len, NULL, NULL); @@ -70,7 +70,7 @@ kget(char *out) return -1; } - i = bytes_written = 0; + i = 0; while (i < len) { id = (struct isa_device *)(buf + i); p = (buf + i + sizeof(struct isa_device)); @@ -105,6 +105,8 @@ kget(char *out) } i += sizeof(struct isa_device) + 8; } + +pnp: /* Now, print the changes to PnP override table */ i = sysctlbyname(mib2, NULL, &len, NULL, NULL); if (i) { @@ -154,6 +156,7 @@ kget(char *out) bytes_written += fprintf(fout,"\n"); } } while ((i += sizeof(struct pnp_cinfo)) < len); + bail: if (bytes_written) fprintf(fout, "q\n"); diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index b311547..6e4b9bf 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.196 1999/04/27 14:33:26 jkh Exp $ + * $Id: menus.c,v 1.197 1999/05/01 11:27:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -443,6 +443,8 @@ DMenu MenuXF86Config = { NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, { "XF98Setup", "Fully graphical XFree86 configuration tool (PC98).", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" }, + { "XDesktop", "X already set up, just do desktop configuration.", + NULL, dmenuSubmenu, NULL, &MenuXDesktops }, { NULL } }, }; @@ -851,7 +853,7 @@ DMenu MenuSrcDistributions = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS , "Select the sub-components of src you wish to install.", "Please check off those portions of the FreeBSD source tree\n" - "you wish to install.", + "you wish to install (remember to use SPACE, not ENTER!).", NULL, NULL, { { "All", "Select all of the below", @@ -1449,6 +1451,8 @@ DMenu MenuSysconsSaver = { dmenuVarCheck, configSaver, NULL, "saver=daemon" }, { "Fade", "Fade out effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fade" }, + { "Fire", "Flames effect screen saver", + dmenuVarCheck, configSaver, NULL, "saver=fire" }, { "Green", "\"Green\" power saving mode (if supported by monitor)", dmenuVarCheck, configSaver, NULL, "saver=green" }, { "Logo", "\"BSD Daemon\" animated screen saver (graphics)", |