[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-521-g0a6ea84
git
git at cross-lfs.org
Sat Nov 23 01:07:12 PST 2013
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, master has been updated
via 0a6ea84761d83351d66e22258e95940bc79bd80f (commit)
via cd44021786d4b5a1a9e246fa248cb48d721b9270 (commit)
from 86e02966946bd609acd14ad49265de92bf8329e5 (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 0a6ea84761d83351d66e22258e95940bc79bd80f
Author: Chris Staub <chris at beaker67.com>
Date: Sat Nov 23 04:07:03 2013 -0500
use nologin from util-linux instead of shadow
diff --git a/BOOK/final-system/common/shadow.xml b/BOOK/final-system/common/shadow.xml
index 05514f7..a624ae9 100644
--- a/BOOK/final-system/common/shadow.xml
+++ b/BOOK/final-system/common/shadow.xml
@@ -34,12 +34,14 @@
</note>
- <para os="b">Disable the installation of the <command>groups</command>
- program and its man pages, as Coreutils provides a better version:</para>
+ <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 '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>
+<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>
@@ -153,7 +155,7 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
<seglistitem>
<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>
<seg>/etc/default</seg>
@@ -378,18 +380,6 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
</listitem>
</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>
<listitem>
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index 7f805eb..56544bd 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -108,8 +108,8 @@ echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></scre
hwclock, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link
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,
ul, umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
@@ -727,6 +727,18 @@ echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></scre
</listitem>
</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>
<listitem>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 412c7e2..ed7b422 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>23 November 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Use nologin from Util-linux instead of Shadow.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>22 November 2013</para>
<itemizedlist>
<listitem>
commit cd44021786d4b5a1a9e246fa248cb48d721b9270
Author: Chris Staub <chris at beaker67.com>
Date: Sat Nov 23 04:06:00 2013 -0500
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index ecad22b..f158c8c 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "11"> <!-- Use two digits -->
<!ENTITY month_name "November">
-<!ENTITY day "22"> <!-- Use two digits -->
+<!ENTITY day "23"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/shadow.xml | 26 ++++++++------------------
BOOK/final-system/common/util-linux.xml | 16 ++++++++++++++--
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 9 +++++++++
4 files changed, 32 insertions(+), 21 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list