Changeset a72db74 for BOOK/final-system

Timestamp:

Jun 2, 2017, 10:02:03 PM (8 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

sysvinit

Children:

b0ebf92

Parents:

f991c3d

git-author:

William Harrington <kb0iic@…> (06/02/17 22:01:57)

git-committer:

William Harrington <kb0iic@…> (06/02/17 22:02:03)

Message:

Shadow nologin should be installed and any remnants of Util-linux nologin should be removed. It is done.

Location:

BOOK/final-system/common

Files:

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

BOOK/final-system/common/shadow.xml

@@ -40 +40 @@
     </note>
 
-    <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>
+    <para os="b">Disable the installation of the <command>groups</command>
+    program and man pages, as better versions of these programs are provided by
+    Coreutils, Util-linux and Man-pages:</para>
 
 <screen os="c"><userinput>sed -i src/Makefile.in \
-  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
+  -e 's/groups$(EXEEXT) //'
 find man -name Makefile.in -exec sed -i \
   -e 's/man1\/groups\.1 //' \
   -e 's/man3\/getspnam\.3 //' \
-  -e 's/man8\/nologin\.8 //' \
   -e 's/man5\/passwd\.5 //' '{}' \;</userinput></screen>
 
@@ -174 +173 @@
         <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
+        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
         vigr (link to vipw), vipw</seg>
@@ -399 +398 @@
       </varlistentry>
 
+      <varlistentry id="nologin">
+        <term><command>nologin</command></term>
+        <listitem>
+          <para>Displays a message that an account is not available. It is
+          designed to be used as the default shell for disabled accounts.</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

@@ -718 +718 @@
       </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="nsenter">
         <term><command>nsenter</command></term>