diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-14 21:35:55 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-14 21:35:55 +0000 |
| commit | 3be02e647340a242a3828b1c4d165eff00bd19e2 (patch) | |
| tree | 5be0509c13115451d4eb3d4ad34d2c0a89f95296 | |
| parent | aceab2d9e847bd465f7e35f5f26f55789e6949b6 (diff) | |
Notes
| -rwxr-xr-x | release/scripts/dokern.sh | 1 | ||||
| -rw-r--r-- | release/sysinstall/config.c | 7 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh index da7660780e2b..3564cbdae0e7 100755 --- a/release/scripts/dokern.sh +++ b/release/scripts/dokern.sh @@ -8,6 +8,7 @@ sed -e '/pty/d' \ -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/d' \ + -e '/SYSVMSG/d' \ -e 's/GENERIC/BOOTMFS/g' echo "options NFS_NOSERVER" diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index d6daadd3596c..366705c1ebf1 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.6 1999/02/14 05:53:12 jkh Exp $ + * $Id: config.c,v 1.115.2.7 1999/02/14 07:39:55 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -378,6 +378,7 @@ configRC_conf(void) FILE *rcSite; Variable *v; int write_header; + static int did_marker = 0; write_header = !file_readable("/etc/rc.conf"); rcSite = fopen("/etc/rc.conf", "a"); @@ -391,6 +392,10 @@ configRC_conf(void) /* Now do variable substitutions */ for (v = VarHead; v; v = v->next) { if (v->dirty) { + if (!did_marker) { + fprintf(rcSite, "# -- sysinstall generated deltas -- #\n"); + did_marker = 1; + } fprintf(rcSite, "%s=\"%s\"\n", v->name, v->value); v->dirty = 0; } diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index e218be369233..d5360776e811 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.7 1999/02/11 14:43:09 jkh Exp $ + * $Id: menus.c,v 1.180.2.8 1999/02/14 20:14:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1394,13 +1394,13 @@ DMenu MenuSysconsSaver = { NULL, { { "Blank", "Simply blank the screen", dmenuVarCheck, configSaver, NULL, "saver=blank" }, - { "Daemon", "\"BSD Daemon\" animated screen saver", + { "Daemon", "\"BSD Daemon\" animated screen saver (text)", dmenuVarCheck, configSaver, NULL, "saver=daemon" }, { "Fade", "Fade out effect screen saver", dmenuVarCheck, configSaver, NULL, "saver=fade" }, { "Green", "\"Green\" power saving mode (if supported by monitor)", dmenuVarCheck, configSaver, NULL, "saver=green" }, - { "Logo", "Logo screen saver", + { "Logo", "\"BSD Daemon\" animated screen saver (graphics)", dmenuVarCheck, configSaver, NULL, "saver=logo" }, { "Rain", "Rain drops screen saver", dmenuVarCheck, configSaver, NULL, "saver=rain" }, |