From ee04ebe3142b0f170ef6662db3b6be3e2ba2e32e Mon Sep 17 00:00:00 2001
From: David Steele <david@crunchydata.com>
Date: Wed, 12 Dec 2018 11:15:09 -0500
Subject: [PATCH] Fix Centos/RHEL 7 documentation builds.

This was caused by a new container version that was released around December 5th.  The new version explicitly denies user logons by leaving /var/run/nologin in place after boot.

The solution is to enable the service that is responsible for removing this file on a successful boot.
---
 doc/release.pl         | 8 ++++----
 doc/xml/user-guide.xml | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/release.pl b/doc/release.pl
index 53797cd0f..844b0522c 100755
--- a/doc/release.pl
+++ b/doc/release.pl
@@ -136,10 +136,10 @@ eval
         executeTest('docker rm -f $(docker ps -a -q)', {bSuppressError => true});
 
         # Generate deployment docs for RHEL/Centos 7
-        # &log(INFO, "Generate RHEL/CentOS 7 documentation");
-        #
-        # executeTest("${strDocExe} --deploy --key-var=os-type=centos7 --out=pdf", {bShowOutputAsync => true});
-        # executeTest("${strDocExe} --deploy --cache-only --key-var=os-type=centos7 --out=pdf");
+        &log(INFO, "Generate RHEL/CentOS 7 documentation");
+
+        executeTest("${strDocExe} --deploy --key-var=os-type=centos7 --out=pdf", {bShowOutputAsync => true});
+        executeTest("${strDocExe} --deploy --cache-only --key-var=os-type=centos7 --out=pdf");
 
         # Generate deployment docs for RHEL/Centos 6
         &log(INFO, "Generate RHEL/CentOS 6 documentation");
diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index 164f31a72..63646df7d 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -116,7 +116,7 @@
         <!-- Hosts -->
         <variable key="host-image">pgbackrest/doc:{[os-type]}</variable>
 
-        <variable key="host-option">-v /sys/fs/cgroup:/sys/fs/cgroup:ro -v /tmp/$(mktemp -d):/run</variable>
+        <variable key="host-option">-v /sys/fs/cgroup:/sys/fs/cgroup:rw -v /tmp/$(mktemp -d):/run</variable>
 
         <variable key="host-user" eval="y">use English; getpwuid($UID) eq 'root' ? 'vagrant' : getpwuid($UID) . ''</variable>
         <variable key="host-mount">{[pgbackrest-path]}:/backrest</variable>
@@ -320,6 +320,11 @@
         RUN adduser -n {[host-user]} &amp;&amp; \
             echo '{[host-user]}        ALL=(ALL)       NOPASSWD: ALL' > /etc/sudoers.d/{[host-user]}
 
+        # Enable the user session service so logons are allowed
+        RUN systemctl enable systemd-user-sessions.service &amp;&amp; \
+            ln -s /usr/lib/systemd/system/systemd-user-sessions.service \
+                /etc/systemd/system/default.target.wants/systemd-user-sessions.service
+
         CMD ["/usr/sbin/init"]
     </host-define>