Changeset 03e6a40 for BOOK/users_groups.ent

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/users_groups.ent (modified) (2 diffs)

BOOK/users_groups.ent

@@ -8 +8 @@
 <!ENTITY uid-adm "3">
 <!ENTITY uid-lp "10">
+<!ENTITY uid-messagebus "27">
 <!ENTITY uid-mail "30">
 <!ENTITY uid-news "31">
@@ -35 +36 @@
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
+<!ENTITY gid-systemd-journal "28">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">
+<!ENTITY gid-wheel "39">
 <!ENTITY gid-users "1000">
 <!ENTITY gid-nogroup "65533">
-<!ENTITY gid-nobody "65534">