Date: Sat, 11 May 2002 13:55:52 +0200 From: Martin Heinen <martin@sumuk.de> To: Giorgos Keramidas <keramida@FreeBSD.ORG> Cc: freebsd-doc@FreeBSD.ORG, Gregory Neil Shapiro <gshapiro@FreeBSD.ORG> Subject: Re: docs/36773: Unclear/inconsistent instructions in Handbook section 19.4.3 Message-ID: <20020511135551.D25671@sumuk.de> In-Reply-To: <200205110950.g4B9o8x33378@freefall.freebsd.org>; from keramida@FreeBSD.ORG on Sat, May 11, 2002 at 02:50:08AM -0700 References: <200205110950.g4B9o8x33378@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 11, 2002 at 02:50:08AM -0700, Giorgos Keramidas wrote:
> How does this look?
fine, comments inline
> %%%
> Index: chapter.sgml
> ===================================================================
> RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
> retrieving revision 1.120
> diff -u -r1.120 chapter.sgml
> --- chapter.sgml 4 May 2002 14:22:34 -0000 1.120
> +++ chapter.sgml 11 May 2002 09:16:22 -0000
> @@ -683,7 +683,7 @@
> </sect2>
>
> <sect2>
> - <title>Update <filename>/etc/group</filename></title>
> + <title>Update the files of <filename>/etc</filename></title>
>
> <para>The <filename>/etc</filename> directory contains a large part
> of your system's configuration information, as well as scripts
> @@ -697,13 +697,13 @@
> <para>There have been occasions when the installation part of
> <quote>make world</quote> has expected certain usernames or groups
> to exist. When performing an upgrade it is likely that these
> - groups did not exist. This caused problems when upgrading.</para>
> + users or groups did not exist. This caused problems when upgrading.</para>
>
> - <para>The most recent example of this is when the <quote/ppp/ group
> - (later renamed <quote/network/) was added. Users had the
> - installation process fail for them when parts of the
> - <filename>ppp</filename> subsystem were installed using a
> - non-existent (for them) group name.</para>
> + <para>The most recent example of this is when the
How about 'A recent example'? This avoids having to update this
section each time a new user is introduced.
> + <username>smmsp</username> user was added. Users had the
> + installation process fail for them when
> + <command>mtree</command> was trying to create
> + <filename>/var/spool/clientmqueue</filename>.</para>
>
> <para>The solution is to examine
> <filename>/usr/src/etc/group</filename> and compare its list of
> @@ -711,7 +711,14 @@
> are not in your file then copy them over. Similarly, you should
> rename any groups in <filename>/etc/group</filename> which have
> the same GID but a different name to those in
> - <filename>/usr/src/etc/group</filename>.</para>
> + <filename>/usr/src/etc/group</filename>. You should also
> + merge any changes from
> + <filename>/usr/src/etc/master.passwd</filename> into your
> + existing <filename>/etc/master.passwd</filename> with
> + &man.vipw.8;. Always use &man.vipw.8; to make the merge to
> + <filename>/etc/master.passwd</filename>, since &man.vipw.8;
> + makes sure that the proper database files are rebuilt after
> + the merge.</para>
mergemaster now hat the -p option, I would like to mention that
here, like:
%%%
Index: chapter.sgml
===================================================================
RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.121
diff -u -r1.121 chapter.sgml
--- chapter.sgml 10 May 2002 16:12:14 -0000 1.121
+++ chapter.sgml 11 May 2002 11:49:46 -0000
@@ -713,6 +713,18 @@
the same GID but a different name to those in
<filename>/usr/src/etc/group</filename>.</para>
+ <para>Since 4.6-RELEASE you can run &man.mergemaster.8; in
+ pre-buildworld mode by providing the <option>-p</option> option.
+ This will compare only those files that are essential for the success
+ of <maketarget>buildworld</maketarget> or
+ <maketarget>installworld</maketarget>. If your old version of
+ <command>mergemaster</command> does not support <option>-p</option>,
+ use the new version in the source tree when running for the first
+ time:</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
+&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
+
<tip>
<para>If you are feeling particularly paranoid, you can check your
system to see which files are owned by the group you are
%%%
--
Marxpitn
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020511135551.D25671>