From a3c830cdda7b59cd12bcde98a688bd77527e2860 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Thu, 19 Feb 2015 22:31:10 +0000
Subject: [PATCH] Import trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10852 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 10 ++++++++++
 chapter06/util-linux.xml |  1 +
 general.ent              |  4 ++--
 packages.ent             |  6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e9ca6fbdd..4df3b4c8e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2015-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.26. Fixes 
+          <ulink url="&lfs-ticket-root;3734">#3734</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-02-17</para>
       <itemizedlist>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 225d0e4a2..9f0bd00d4 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -66,6 +66,7 @@
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
+            --disable-nologin    \
             --disable-su         \
             --disable-setpriv    \
             --disable-runuser    \
diff --git a/general.ent b/general.ent
index 6a982f889..d12ba058b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20150217-systemd">
+<!ENTITY version         "20150219-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 17, 2015">
+<!ENTITY releasedate     "February 19, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index e56aa7687..9d7794677 100644
--- a/packages.ent
+++ b/packages.ent
@@ -568,10 +568,10 @@
 <!ENTITY tzdata-md5 "4ed11c894a74a5ea64201b1c6dbb8831">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
-<!ENTITY util-linux-version "2.26-rc2">
-<!ENTITY util-linux-size "3,748 KB">
+<!ENTITY util-linux-version "2.26">
+<!ENTITY util-linux-size "3758 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.26/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "cd12e74826ec1efa750a59ce1fd72057">
+<!ENTITY util-linux-md5 "912c550a4e5c47c0ce9abd0733fa9a64">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "104 MB">
 <!ENTITY util-linux-ch5-sbu "0.7 SBU">