summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Goodyear <g2boojum@gentoo.org>2001-10-17 21:48:53 +0000
committerGrant Goodyear <g2boojum@gentoo.org>2001-10-17 21:48:53 +0000
commitbae0deaec55247db66d389844730df6239157856 (patch)
tree2da5abf36164cd36618748e71353487fda6837ed /app-doc
parentAlso modified ebuild for imapd-ssl. Added rc6 init scripts to files (diff)
downloadhistorical-bae0deaec55247db66d389844730df6239157856.tar.gz
historical-bae0deaec55247db66d389844730df6239157856.tar.bz2
historical-bae0deaec55247db66d389844730df6239157856.zip
Added config protection stuff to desktop, faq, and portage-user guides.
Squirrelmail and apache soon to be added to the desktop guide.
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/gentoo-web/files/xml/build.xml6
-rw-r--r--app-doc/gentoo-web/files/xml/desktop.xml15
-rw-r--r--app-doc/gentoo-web/files/xml/faq.xml28
-rwxr-xr-xapp-doc/gentoo-web/files/xml/portage-user.xml6
4 files changed, 55 insertions, 0 deletions
diff --git a/app-doc/gentoo-web/files/xml/build.xml b/app-doc/gentoo-web/files/xml/build.xml
index e124f63c2ffd..cc22d5204cb4 100644
--- a/app-doc/gentoo-web/files/xml/build.xml
+++ b/app-doc/gentoo-web/files/xml/build.xml
@@ -402,10 +402,16 @@ Have a nice nap.
optimizations for your system, it's time to build the rest
of the base system:</p>
<pre>
+# <i>export CONFIG_PROTECT=""</i>
# <i>emerge --pretend system</i>
<comment>[lists the packages to be installed]</comment>
# <i>emerge system</i>
</pre>
+<note>The Gentoo init scripts have changed fairly radically for rc6, and
+the <c>export CONFIG_PROTECT=""</c> line ensures that the new scripts will
+overwrite the old scripts (stored in <path>sys-apps/baselayout</path>), despite
+Portage's new config file management support. Type <c>emerge --help config</c>
+for more details.</note>
<p>
It's going to take a while to finish building the entire base
system. Your reward is that it will be thoroughly optimized for
diff --git a/app-doc/gentoo-web/files/xml/desktop.xml b/app-doc/gentoo-web/files/xml/desktop.xml
index 46887d4d25c0..24440ba03afe 100644
--- a/app-doc/gentoo-web/files/xml/desktop.xml
+++ b/app-doc/gentoo-web/files/xml/desktop.xml
@@ -764,4 +764,19 @@ for additional help.
</section>
</chapter>
+<chapter>
+<title>Apache and Squirrelmail webmail</title>
+<section>
+<title>Apache with SSL and PHP</title>
+<p>Coming soon!</p>
+</section>
+<section>
+<title>Courier IMAP</title>
+<p>Coming soon!</p>
+</section>
+<section>
+<title>Squirrelmail</title>
+<p>Coming soon!</p>
+</section>
+</chapter>
</guide>
diff --git a/app-doc/gentoo-web/files/xml/faq.xml b/app-doc/gentoo-web/files/xml/faq.xml
index d982720e7587..c51a96bc25b7 100644
--- a/app-doc/gentoo-web/files/xml/faq.xml
+++ b/app-doc/gentoo-web/files/xml/faq.xml
@@ -235,6 +235,34 @@ the various configuration files is as follows (highest first):
an incorrect order.</p></body>
</section>
+
+ <section>
+ <title>When updating a package using <c>emerge</c> or <c>ebuild</c>, how do I avoid clobbering my config files?</title>
+ <body><p>
+ Portage now includes config file management support by default. Type
+ <c>emerge --help config</c> for more details. The (overly) simple answer is that if
+ a package installs <path>foo</path> somewhere under <path>/etc</path>, and
+ another <path>foo</path> already exists there, then the new <path>foo</path> will
+ instead be renamed to <path>._cfgxxxx_foo</path> in that directory.
+ </p></body>
+ </section>
+
+ <section>
+ <title>I want to perform the <c>./configure</c> step myself. Can I?</title>
+ <body><p>
+ Yes, but it is not trivial. First do <c>man ebuild</c> followed by
+ <c>ebuild foo-x.y.z.ebuild unpack</c>. Then <c>cd</c> to
+ <path>/var/tmp/portage/foo-x.y.z/work</path>. You can manually perform
+ the <c>./configure</c> and <c>make</c> steps yourself (you'll have to do
+ both, since Portage does not separate the configure and build steps). To
+ have Portage finish the installation (so that you can easily remove it later,
+ should you desire to do so, and it will be registered in Portage as a possible
+ dependency) you first need to <c>touch /var/tmp/portage/foo-x.y.z/.compiled</c>
+ (tricking Portage into thinking that <c>ebuild foo-x.y.z.ebuild compile</c> has
+ completed), followed by <c>ebuild foo-x.y.z.ebuild merge</c>.
+ </p></body>
+ </section>
+
<section>
<title>What if rsync doesn't work for me?</title>
<body><p>If you're behind a firewall that doesn't permit
diff --git a/app-doc/gentoo-web/files/xml/portage-user.xml b/app-doc/gentoo-web/files/xml/portage-user.xml
index cf18d221a423..d81c4425a7c8 100755
--- a/app-doc/gentoo-web/files/xml/portage-user.xml
+++ b/app-doc/gentoo-web/files/xml/portage-user.xml
@@ -215,6 +215,12 @@ all times. If you had to unmerge first, then xchat wouldn't be available
for a few minutes while the new version was being downloaded, compiled,
installed and merged.</p>
+<impo>Portage now has a special feature called "config file protection". The purpose of
+this feature is to prevent new package installs from clobbering existig
+configuration files. By default, config file protection is turned on for /etc
+and the KDE configuration dirs; more may be added in the future. Type
+<c>emerge --help config</c> for more details.</impo>
+
</body>
</section>
</chapter>