From owner-freebsd-bugs Thu Aug 16 0:40: 9 2001 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 41B4837B403 for ; Thu, 16 Aug 2001 00:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7G7e2j96499; Thu, 16 Aug 2001 00:40:02 -0700 (PDT) (envelope-from gnats) Date: Thu, 16 Aug 2001 00:40:02 -0700 (PDT) Message-Id: <200108160740.f7G7e2j96499@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: parv Subject: Re: conf/29764: sysinstall puts confusing message in /etc/rc.conf about 'this file' Reply-To: parv Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR conf/29764; it has been noted by GNATS. From: parv To: Hans Hoppe Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: conf/29764: sysinstall puts confusing message in /etc/rc.conf about 'this file' Date: Thu, 16 Aug 2001 03:33:59 -0400 this was, on the fateful occasion around Aug 16 03:08 -0400, sent by Hans Hoppe > > ... > >Description: > /stand/sysinstall puts the following text in /etc/rc.conf: > > # This file now contains just the overrides from /etc/defaults/rc.conf > # please make all changes to this file. > > There could be confusion whether 'this file' on the second line refers to > /etc/defaults/rc.conf or /etc/rc.conf. > ... > >Fix: > Suggested diff for config.c: > > --- usr/src/release/sysinstall/config.c.orig Wed Jul 4 08:56:37 2001 > +++ usr/src/release/sysinstall/config.c Thu Aug 16 08:49:25 2001 > @@ -389,7 +389,7 @@ > return; > if (write_header) { > fprintf(rcSite, "# This file now contains just the overrides from /etc/defaults/rc.conf\n"); > - fprintf(rcSite, "# please make all changes to this file.\n\n"); > + fprintf(rcSite, "# please make all changes to /etc/rc.conf.\n\n"); > fprintf(rcSite, "# Enable network daemons for user convenience.\n"); > if ((t_loc = time(NULL)) != -1 && (cp = ctime(&t_loc))) > fprintf(rcSite, "# Created: %s", cp); i think it will be better if "this" and "/etc/rc.conf" are interchanged to print... # /etc/rc.conf file now contains just the overrides from # /etc/defaults/rc.conf please make all changes to this file. ...here is the patch... --- src/release/sysinstall/config.c.old Thu Aug 16 03:28:19 2001 +++ src/release/sysinstall/config.c Thu Aug 16 03:29:49 2001 @@ -388,8 +388,8 @@ if (!rcSite) return; if (write_header) { - fprintf(rcSite, "# This file now contains just the overrides from /etc/defaults/rc.conf\n"); - fprintf(rcSite, "# please make all changes to this file.\n\n"); + fprintf(rcSite, "# /etc/rc.conf file now contains just the overrides from \n"); + fprintf(rcSite, "# /etc/defaults/rc.conf please make all changes to this file.\n\n"); fprintf(rcSite, "# Enable network daemons for user convenience.\n"); if ((t_loc = time(NULL)) != -1 && (cp = ctime(&t_loc))) fprintf(rcSite, "# Created: %s", cp); -- so, do you like word games or scrabble? - parv To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message