Prechádzať zdrojové kódy

Added sulogin and mesg utilities to util-linux package, changed kmod --libdir to --with-rootlibdir plus minor fixes, minor fix for coreutils page. You might want last two in LFS, too.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10119 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 12 rokov pred
rodič
commit
c62cd4614c

+ 10 - 0
chapter01/changelog.xml

@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2013-02-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Modified Util-Linux instructions to
+          install mesg and sulogin utilities that were part of
+          Sysvinit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2013-02-06</para>

+ 1 - 1
chapter06/coreutils.xml

@@ -156,7 +156,7 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8</userinput></screen>
         timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq,
         unlink, users, vdir, wc, who, whoami, and yes</seg>
         <seg>libstdbuf.so</seg>
-        <seg>/usr/libexec/coreutils</seg>
+        <seg>/usr/lib/coreutils</seg>
       </seglistitem>
     </segmentedlist>
 

+ 19 - 9
chapter06/kmod.xml

@@ -43,17 +43,26 @@
 
     <para>Prepare Kmod for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr       \
-            --bindir=/bin       \
-            --libdir=/lib       \
-            --sysconfdir=/etc   \
-            --disable-manpages  \
-            --with-xz           \
+<screen><userinput remap="configure">./configure --prefix=/usr          \
+            --bindir=/bin          \
+            --sysconfdir=/etc      \
+            --with-rootlibdir=/lib \
+            --disable-manpages     \
+            --with-xz              \
             --with-zlib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>--with-rootlibdir</parameter></term>
+        <listitem>
+          <para>This switch ensures that shared library is installed in
+          <filename class="directory">/lib</filename> instead of 
+          <filename class="directory">/usr/lib</filename>.</para>
+        </listitem>  
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-*</parameter></term>
         <listitem>
@@ -84,9 +93,10 @@
     Module-Init-Tools, the package that previously handled Linux kernel modules:
     </para>
 
-<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install
+<!-- I remember some package was looking for /sbin/lsmod - Probably proprietary one. -->
+<screen><userinput remap="install">make install
 
-for target in depmod insmod modinfo modprobe rmmod; do
+for target in depmod insmod lsmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
 done
 
@@ -105,7 +115,7 @@ ln -sv kmod /bin/lsmod</userinput></screen>
         <seg>depmod (link to kmod), insmod (link to kmod), kmod, kmod-nolib,
         lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
         and rmmod (link to kmod)</seg>
-        <seg>/lib/kmod.so</seg>
+        <seg>libkmod.so</seg>
       </seglistitem>
     </segmentedlist>
 

+ 46 - 4
chapter06/util-linux.xml

@@ -59,7 +59,10 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-<screen><userinput remap="configure">./configure --disable-su --disable-sulogin --disable-login</userinput></screen>
+<screen><userinput remap="configure">./configure --disable-su    \
+            --disable-login \
+            --enable-mesg   \
+            --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
@@ -67,7 +70,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-*</parameter></term>
         <listitem>
-          <para>These switches disable building su, sulogin, and login.  They
+          <para>These switches disable building su and login. They
           duplicate the same programs provided by <xref
           linkend='ch-system-shadow'/>.
           They also require
@@ -75,6 +78,22 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
           which is not available in LFS.</para>
         </listitem>
       </varlistentry>
+
+     <varlistentry>
+        <term><parameter>--enable-mesg</parameter></term>
+        <listitem>
+          <para>This switch enables building of the mesg utility which
+          was previously provided by Sysvinit package.</para>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry>
+        <term><parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter></term>
+        <listitem>
+          <para>This switch sets install location for the Systemd units provided
+          with the package.</para>
+        </listitem>  
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
@@ -103,11 +122,11 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         dmesg, eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386,
         ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, linux32, linux64,
-        logger, look, losetup, lsblk, lscpu, lslocks, mcookie, mkfs, mkfs.bfs,
+        logger, look, losetup, lsblk, lscpu, lslocks, mcookie, mesg, mkfs, mkfs.bfs,
         mkfs.cramfs, mkfs.minix, mkswap, more, mount, mountpoint, namei, partx,
         pg, pivot_root, prlimit, raw, readprofile, rename, renice, resizepart,
         rev, rtcwake, script, scriptreplay, setarch, setsid, setterm, sfdisk,
-        swaplabel, swapoff (link to swapon), swapon, switch_root, tailf,
+        sulogin, swaplabel, swapoff (link to swapon), swapon, switch_root, tailf,
         taskset, tunelp, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall,
         wdctl, whereis, wipefs, and x86_64</seg>
 
@@ -620,6 +639,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="mesg">
+        <term><command>mesg</command></term>
+        <listitem>
+          <para>Controls whether other users can send messages to the current
+          user's terminal</para>
+          <indexterm zone="ch-system-util-linux mesg">
+            <primary sortas="b-mesg">mesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mkfs">
         <term><command>mkfs</command></term>
         <listitem>
@@ -888,6 +918,18 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="sulogin">
+        <term><command>sulogin</command></term>
+        <listitem>
+          <para>Allows <systemitem class="username">root</systemitem> to log in;
+          it is normally invoked by <command>init</command> when the system goes
+          into single user mode</para>
+          <indexterm zone="ch-system-util-linux sulogin">
+            <primary sortas="b-sulogin">sulogin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="swaplabel">
         <term><command>swaplabel</command></term>
         <listitem>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20130206">
-<!ENTITY releasedate "February 6, 2013">
+<!ENTITY version "SYSTEMD-20130210">
+<!ENTITY releasedate "February 10, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->