db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Fix Centos/RHEL 7 documentation builds.

Browse Source 
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.
This commit is contained in:
David Steele 2018-12-12 11:15:09 -05:00
parent 2f15a90d18
commit ee04ebe314
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/release.pl
View File

@ -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");

7
doc/xml/user-guide.xml
View File

@ -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>