From 030875a8e3774097943cad7dcd12f8c20e454c55 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 22 Apr 2014 18:28:32 +0000
Subject: Update users so all acl tests pass

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10546 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/createfiles.xml | 9 ++++++---
 chapter06/shadow.xml      | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'chapter06')

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>
-- 
cgit v1.2.3-54-g00ecf