diff options
author | jkh <jkh@FreeBSD.org> | 1999-02-14 21:35:02 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-02-14 21:35:02 +0000 |
commit | 607d5f3ccf8149c9778a6918acd08cc44d0147c7 (patch) | |
tree | 4fd2ff48bd38f7587e5b30141e354cd5d91e893b | |
parent | 8f8ca5b92498bb21a58ac50274ed1dfe20ff3315 (diff) | |
download | FreeBSD-src-607d5f3ccf8149c9778a6918acd08cc44d0147c7.zip FreeBSD-src-607d5f3ccf8149c9778a6918acd08cc44d0147c7.tar.gz |
Put a convenient marker in rc.conf to show updates.
Better screen saver descriptions.
-rw-r--r-- | release/sysinstall/config.c | 7 | ||||
-rw-r--r-- | release/sysinstall/menus.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/config.c | 7 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/config.c | 7 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 6 |
6 files changed, 27 insertions, 12 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index e261bc5..74cd515 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.122 1999/02/14 05:52:57 jkh Exp $ + * $Id: config.c,v 1.123 1999/02/14 07:35:27 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 38e1700..0235453 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.189 1999/02/11 14:42:39 jkh Exp $ + * $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1403,13 +1403,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" }, diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index e261bc5..74cd515 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.122 1999/02/14 05:52:57 jkh Exp $ + * $Id: config.c,v 1.123 1999/02/14 07:35:27 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/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 38e1700..0235453 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.189 1999/02/11 14:42:39 jkh Exp $ + * $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1403,13 +1403,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" }, diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index e261bc5..74cd515 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/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.122 1999/02/14 05:52:57 jkh Exp $ + * $Id: config.c,v 1.123 1999/02/14 07:35:27 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/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 38e1700..0235453 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/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.189 1999/02/11 14:42:39 jkh Exp $ + * $Id: menus.c,v 1.190 1999/02/14 20:14:07 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1403,13 +1403,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" }, |