[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-76-g5898fbf
git
git at cross-lfs.org
Fri Sep 5 07:39:13 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via 5898fbf90635fe8520718a8b11bece59ab5313f7 (commit)
via 7a352da879a03963c930b3b0c4be1fba89deb51d (commit)
via 95835e74db9b2dad705ea9226e41492f81bc62c9 (commit)
via 22610fa18cc5367824feda9d7e7c372d30f0b2a8 (commit)
from 234b86ace759a0a721d2819b2e5df136efc58154 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5898fbf90635fe8520718a8b11bece59ab5313f7
Author: Chris Staub <chris at beaker67.com>
Date: Fri Sep 5 10:38:41 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 50688e4..e393120 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "08"> <!-- Use two digits -->
-<!ENTITY month_name "August">
-<!ENTITY day "29"> <!-- Use two digits -->
+<!ENTITY month "09"> <!-- Use two digits -->
+<!ENTITY month_name "September">
+<!ENTITY day "04"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 7a352da879a03963c930b3b0c4be1fba89deb51d
Merge: 95835e7 234b86a
Author: Chris Staub <chris at beaker67.com>
Date: Fri Sep 5 10:37:25 2014 -0400
Merge branch 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit
Conflicts:
BOOK/general.ent
commit 95835e74db9b2dad705ea9226e41492f81bc62c9
Author: Chris Staub <chris at beaker67.com>
Date: Fri Sep 5 10:33:47 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 851255f..e393120 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "08"> <!-- Use two digits -->
-<!ENTITY month_name "August">
-<!ENTITY day "18"> <!-- Use two digits -->
+<!ENTITY month "09"> <!-- Use two digits -->
+<!ENTITY month_name "September">
+<!ENTITY day "04"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 22610fa18cc5367824feda9d7e7c372d30f0b2a8
Author: Chris Staub <chris at beaker67.com>
Date: Fri Sep 5 10:31:52 2014 -0400
Update text on bash startup files/locales
diff --git a/BOOK/system-config/common/locale.xml b/BOOK/system-config/common/locale.xml
index 4a08b44..fb44758 100644
--- a/BOOK/system-config/common/locale.xml
+++ b/BOOK/system-config/common/locale.xml
@@ -13,9 +13,10 @@
<primary sortas="e-/etc/profile">/etc/profile</primary>
</indexterm>
- <para>The base <filename>/etc/profile</filename> below sets some
- environment variables necessary for native language support. Setting
- them properly results in:</para>
+ <para>The instructions below explain how to add some environment variables
+ necessary for native language support to the base
+ <filename>/etc/profile</filename> created in the previous section. Setting
+ these variables properly results in:</para>
<itemizedlist>
<listitem>
@@ -38,10 +39,6 @@
</listitem>
</itemizedlist>
- <para>This script also sets the <envar>INPUTRC</envar> environment variable
- that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
- created earlier.</para>
-
<para>Replace <replaceable>[ll]</replaceable> below with the
two-letter code for the desired language (e.g., <quote>en</quote>) and
<replaceable>[CC]</replaceable> with the two-letter code for the
@@ -111,14 +108,12 @@ LC_ALL=[locale name] locale int_prefix</userinput></screen>
In those cases, investigating how other Linux distributions support your locale
might provide some useful information.</para>
- <para>Once the proper locale settings have been determined, create the
+ <para>Once the proper locale settings have been determined, add them to the
<filename>/etc/profile</filename> file:</para>
-<screen><userinput>cat > /etc/profile << "EOF"
-<literal># Begin /etc/profile
+<screen><userinput>cat >> /etc/profile << "EOF"
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
-export INPUTRC=/etc/inputrc
+<literal>export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
# End /etc/profile</literal>
EOF</userinput></screen>
diff --git a/BOOK/system-config/common/profile.xml b/BOOK/system-config/common/profile.xml
index 5229c4b..fab9a2b 100644
--- a/BOOK/system-config/common/profile.xml
+++ b/BOOK/system-config/common/profile.xml
@@ -37,8 +37,22 @@
<para>The files <filename>/etc/profile</filename> and
<filename>~/.bash_profile</filename> are read when the shell is
- invoked as an interactive login shell. In the next section, a base
- <filename>/etc/profile</filename> will be created to set up locale
- information.</para>
+ invoked as an interactive login shell. Create a base
+ <filename>/etc/profile</filename> that will load any Bash auto completion
+ files that may be on the system, and set the <envar>INPUTRC</envar>
+ environment variable that makes Bash and Readline use
+ <filename>/etc/inputrc</filename>:</para>
+
+<screen><userinput>cat > /etc/profile << "EOF"
+<literal># Begin /etc/profile
+
+for f in /etc/bash_completion.d/*
+do
+ if [ -e ${f} ]; then source ${f}; fi
+done
+unset f
+
+export INPUTRC=/etc/inputrc</literal>
+EOF</userinput></screen>
</sect1>
-----------------------------------------------------------------------
Summary of changes:
BOOK/general.ent | 6 +++---
BOOK/system-config/common/locale.xml | 19 +++++++------------
BOOK/system-config/common/profile.xml | 20 +++++++++++++++++---
3 files changed, 27 insertions(+), 18 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list