From f8fe89705735085bfabefb9b87028e3562696af0 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 6 Apr 2014 03:19:37 +0000
Subject: [PATCH] Add groups and a user for systemd. Correct files so udev rule
 for persistent network cards works properly.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10525 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/createfiles.xml | 4 ++++
 packages.ent              | 4 ++--
 udev-lfs/Makefile.lfs     | 9 +++++----
 udev-lfs/write_net_rules  | 1 -
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 4d7fcac31..5161d6505 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
+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>
 
@@ -92,6 +93,9 @@ video:x:12:
 utmp:x:13:
 usb:x:14:
 cdrom:x:15:
+adm:x:16:
+messagebus:x:18:
+systemd-journal:x:23:
 mail:x:34:
 nogroup:x:99:</literal>
 EOF</userinput></screen>
diff --git a/packages.ent b/packages.ent
index d1623eef7..f32fd9d99 100644
--- a/packages.ent
+++ b/packages.ent
@@ -610,10 +610,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY udev-lfs-version "udev-lfs-20140302">
+<!ENTITY udev-lfs-version "udev-lfs-20140306">
 <!ENTITY udev-lfs-size    "11 KB">
 <!ENTITY udev-lfs-url     "&anduin-other;&udev-lfs-version;.tar.bz2">
-<!ENTITY udev-lfs-md5     "81fd93e43e2c232932f38223ba2b740c">
+<!ENTITY udev-lfs-md5     "988003f0247b4ac98fe77f73ad252a8d">
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-version "2.24.1">
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index 0bbc66584..6da7b3a06 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -3,7 +3,7 @@
 
 # vim: tabstop=3
 
-VERSION=20140302
+VERSION=20140305
 SHELL=/bin/bash
 
 ifeq ($(V),)
@@ -21,9 +21,10 @@ install:
               $(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
 
    # Copy rules
-	@cp -v udev-lfs-$(VERSION)/*.rules            $(DESTDIR)/etc/udev/rules.d
-	@cp -v udev-lfs-$(VERSION)/*_rules            $(DESTDIR)/lib/udev
-	@cp -v udev-lfs-$(VERSION)/init-net-rules.sh  $(DESTDIR)/lib/udev
+	@cp -v udev-lfs-$(VERSION)/*.rules $(DESTDIR)/etc/udev/rules.d
+	@cp -v udev-lfs-$(VERSION)/*_rules           \
+          udev-lfs-$(VERSION)/init-net-rules.sh \
+          udev-lfs-$(VERSION)/rule_generator.functions $(DESTDIR)/lib/udev
 
    # Copy documentation
 	@cp -v udev-lfs-$(VERSION)/README     $(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
diff --git a/udev-lfs/write_net_rules b/udev-lfs/write_net_rules
index bcea4b09d..f7c77616f 100755
--- a/udev-lfs/write_net_rules
+++ b/udev-lfs/write_net_rules
@@ -115,7 +115,6 @@ if [ -z "$match" ]; then
 fi
 
 basename=${INTERFACE%%[0-9]*}
-match="$match, KERNEL==\"$basename*\""
 
 if [ "$INTERFACE_NAME" ]; then
         # external tools may request a custom name