diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
| commit | 2d49c1f84a59e88e141376618bf51b8813536403 (patch) | |
| tree | 9fcc4285eb30bc91d2abfcdf96cfbf01e2be5ba0 /usr.sbin/sade | |
| parent | 9775e37869327775444a6625e70f2122d09b9773 (diff) | |
| download | src-2d49c1f84a59e88e141376618bf51b8813536403.tar.gz src-2d49c1f84a59e88e141376618bf51b8813536403.zip | |
Notes
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/config.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sade/menus.c | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 52e90f25f2e8..b2f0f6f5167d 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/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/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 703a760972e3..974645724ad2 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/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/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index b31154745a08..6e4b9bfa1bef 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/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)", |