Changeset c806f4a

Timestamp:

10/26/2014 01:18:53 PM (9 years ago)

Author:

Krejzi <krejzi@…>

Branches:

krejzi/svn

Children:

8ddd9c79

Parents:

7178f6d

Message:

Import postlfs config section.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd-ng@14735 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/config/bootdisk.xml (modified) (1 diff)
• postlfs/config/config.xml (modified) (2 diffs)
• postlfs/config/lsb-release.xml (modified) (1 diff)
• postlfs/config/profile-systemd.xml (moved) (moved from postlfs/config/profile.xml ) (2 diffs)

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - .</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Adjust Postlfs Configuration for use with LFS systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Imported systemd-units from main systemd branch..</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Rebranded the book into systemd-ng book.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Imported BLFS revision 14732.</para>
         </listitem>

postlfs/config/bootdisk.xml

@@ -70 +70 @@
     <para>The instructions for using GRUB2 to make a custom rescue CD-ROM are
     also available in <ulink
-    url='http://www.&lfs-domainname;/lfs/view/stable/chapter08/grub.html'>LFS
+    url='&lfs-root;/chapter08/grub.html'>LFS
     Chapter 8</ulink>.</para>
 

postlfs/config/config.xml

@@ -40 +40 @@
 
   <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
-  <xref linkend="postlfs-config-shells"/>, <xref linkend="postlfs-config-random"/>,
-  <xref linkend="autofs"/>, and
-  <xref linkend="postlfs-config-netfs"/> are then addressed, in that order. They
+  <xref linkend="postlfs-config-shells"/>, and
+  <xref linkend="autofs"/>
+  are then addressed, in that order. They
   don't have much interaction with the other topics in this chapter.</para>
 
@@ -49 +49 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-release.xml"/>
 

postlfs/config/lsb-release.xml

@@ -87 +87 @@
       <para>
         The configuration for this package was done in 
-        <ulink url="&lfs-website;/lfs/view/stable/chapter09/theend.html">LFS</ulink>.  
+        <ulink url="&lfs-root;/chapter09/theend.html">LFS</ulink>.  
         The file <filename>/etc/lsb-release</filename> should already exist.
         Be sure that the DISTRIB_CODENAME entry has been set properly.

postlfs/config/profile-systemd.xml

@@ -230 +230 @@
 if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
         pathprepend /usr/local/sbin
-fi</literal>
+fi
 
 # Set some defaults before other applications add to these paths.
 pathappend /usr/share/man  MANPATH
-pathappend /usr/share/info INFOPATH
+pathappend /usr/share/info INFOPATH</literal>
 EOF</userinput></screen>
 
@@ -311 +311 @@
     </indexterm>
 
-      <para>This script sets an environment variable necessary for
-      native language support. A full discussion on determining this
-      variable can be found on the <ulink
-      url="&lfs-root;/chapter07/profile.html">LFS Bash Shell
-      Startup Files</ulink> page.</para>
+      <para>This script sets environment variables necessary for
+      native language support.</para>
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Set up i18n variables
-export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable></literal>
+<literal># Begin /etc/profile.d/i18n.sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ -n "$XDG_CONFIG_HOME" ] &amp;&amp; [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+  . "$XDG_CONFIG_HOME/locale.conf"
+elif [ -r /etc/locale.conf ]; then
+  . /etc/locale.conf
+fi
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ]          &amp;&amp; export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        &amp;&amp; export LC_NUMERIC
+[ -n "$LC_TIME" ]           &amp;&amp; export LC_TIME
+[ -n "$LC_COLLATE" ]        &amp;&amp; export LC_COLLATE
+[ -n "$LC_MONETARY" ]       &amp;&amp; export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       &amp;&amp; export LC_MESSAGES
+[ -n "$LC_PAPER" ]          &amp;&amp; export LC_PAPER
+[ -n "$LC_NAME" ]           &amp;&amp; export LC_NAME
+[ -n "$LC_ADDRESS" ]        &amp;&amp; export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      &amp;&amp; export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    &amp;&amp; export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] &amp;&amp; export LC_IDENTIFICATION
+
+# End /etc/profile.d/i18n.sh</literal>
 EOF</userinput></screen>