aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2014-04-22 18:28:32 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2014-04-22 18:28:32 +0000
commit030875a8e3774097943cad7dcd12f8c20e454c55 (patch)
tree78047bcd0a3cf9f7d2614fb49261fb7f70cf001d
parentb17411e84995d09d5b5339f12fe6408086bdd688 (diff)
Update users so all acl tests pass
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10546 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/createfiles.xml9
-rw-r--r--chapter06/shadow.xml5
3 files changed, 15 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e426b6f58..2ba91a0c2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
<para>2014-03-22</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update users so all acl tests pass. Fixes
+ <ulink url="&lfs-ticket-root;3548">#3548</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[krejzi] - Fix a segfault in shuf program from
Coreutils. Fixes
<ulink url="&lfs-ticket-root;3550">#3550</ulink>.</para>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 5161d6505..76fc5174a 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -66,6 +66,7 @@ ln -sv bash /bin/sh</userinput></screen>
<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
<literal>root:x:0:0:root:/root:/bin/bash
bin:x:1:1:bin:/dev/null:/bin/false
+daemon:x:6:6:Daemon User:/dev/null:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
EOF</userinput></screen>
@@ -78,7 +79,7 @@ EOF</userinput></screen>
<screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
<literal>root:x:0:
-bin:x:1:
+bin:x:1:daemon
sys:x:2:
kmem:x:3:
tape:x:4:
@@ -97,13 +98,15 @@ adm:x:16:
messagebus:x:18:
systemd-journal:x:23:
mail:x:34:
-nogroup:x:99:</literal>
+nogroup:x:99:
+users:x:999:</literal>
EOF</userinput></screen>
<para>The created groups are not part of any standard&mdash;they are groups
decided on in part by the requirements of the Udev configuration in this
chapter, and in part by common convention employed by a number of existing
- Linux distributions. The Linux Standard Base (LSB, available at <ulink
+ Linux distributions. In addition, some test suites rely on specific users
+ or groups. The Linux Standard Base (LSB, available at <ulink
url="http://www.linuxbase.org"/>) recommends only that, besides the group
<systemitem class="groupname">root</systemitem> with a Group ID (GID) of 0,
a group <systemitem class="groupname">bin</systemitem> with a GID of 1 be
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 0f30426d8..8742bda28 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -72,6 +72,11 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
</note>
+ <para>Make a minor change to make the default useradd consistent with the LFS
+ groups file:</para>
+
+<screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
+
<para>Prepare Shadow for compilation:</para>
<screen><userinput remap="configure">./configure --sysconfdir=/etc</userinput></screen>