Changeset 0a6ea84 for BOOK/final-system

Timestamp:

Nov 23, 2013, 1:07:03 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

358ffc2

Parents:

cd44021

Message:

use nologin from util-linux instead of shadow

Location:

BOOK/final-system/common

Files:

• shadow.xml (modified) (3 diffs)
• util-linux.xml (modified) (2 diffs)

BOOK/final-system/common/shadow.xml

@@ -35 +35 @@
 
 
-    <para os="b">Disable the installation of the <command>groups</command>
-    program and its man pages, as Coreutils provides a better version:</para>
-
-<screen os="c"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-find man -name Makefile.in -exec sed -i '/groups\.1\.xml/d' '{}' \;
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+    <para os="b">Disable the installation of the <command>groups</command> and
+    <command>nologin</command> programs and their man pages, as better versions
+    of these programs are provided by Coreutils and Util-linux:</para>
+
+<screen os="c"><userinput>sed -i src/Makefile.in \
+  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
+find man -name Makefile.in -exec sed -i \
+  -e 's/man1\/groups\.1 //' -e 's/man8\/nologin\.8 //' '{}' \;</userinput></screen>
 
     <para os="d">Prepare Shadow for compilation:</para>
@@ -154 +156 @@
         <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
+        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
         vigr (link to vipw), and vipw</seg>
@@ -379 +381 @@
       </varlistentry>
 
-      <varlistentry id="nologin">
-        <term><command>nologin</command></term>
-        <listitem>
-          <para>Displays a message that an account is not available. Designed
-          to be used as the default shell for accounts that have been
-          disabled</para>
-          <indexterm zone="ch-system-shadow nologin">
-            <primary sortas="b-nologin">nologin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="passwd">
         <term><command>passwd</command></term>

BOOK/final-system/common/util-linux.xml

@@ -109 +109 @@
         to last), ldattach, 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,
+        mount, mountpoint,  namei, nologin, partx, pg, pivot_root, prlimit,
+        raw, readprofile, rename, renice, resizepart, rev, rtcwake, script,
         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, tunelp,
@@ -728 +728 @@
       </varlistentry>
 
+      <varlistentry id="nologin">
+        <term><command>nologin</command></term>
+        <listitem>
+          <para>Displays a message that an account is not available. Designed
+          to be used as the default shell for accounts that have been
+          disabled</para>
+          <indexterm zone="ch-system-util-linux nologin">
+            <primary sortas="b-nologin">nologin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="partx">
         <term><command>partx</command></term>