From 781af88a46a8d742c000c5a0da2120c7755a9fd6 Mon Sep 17 00:00:00 2001
From: Robert Fairley <rfairley@redhat.com>
Date: Jan 23 2019 20:28:32 +0000
Subject: change generated issue to be scoped in private directory


---

diff --git a/console-login-helper-messages.spec b/console-login-helper-messages.spec
index c21c50e..1e8d757 100644
--- a/console-login-helper-messages.spec
+++ b/console-login-helper-messages.spec
@@ -41,8 +41,11 @@ Requires:       bash systemd setup
 # systemd-udev: for udev rules
 Requires:       systemd-udev
 # fedora-release: for /etc/issue.d path
-# TODO: add in version number on the fedora-release Requires once /etc/issue.d is owned
+#   * https://src.fedoraproject.org/rpms/fedora-release/pull-request/64#
 Requires:       fedora-release
+# TODO: add a requires for redhat-release-coreos once merged
+#   * https://github.com/openshift/redhat-release-coreos/pull/18
+# Requires:       redhat-release-coreos
 # agetty is included in util-linux, which searches /etc/issue.d.
 # Needed to display issues symlinked from /etc/issue.d.
 #   * https://github.com/karelzak/util-linux/commit/37ae6191f7c5686f1f9a2c3984e2cd9a62764029#diff-15eca7082c3cb16e5ac467f4acceb9d0R54
@@ -102,7 +105,7 @@ install -DpZm 0644 usr/lib/tmpfiles.d/%{name}-profile-tmpfiles.conf %{buildroot}
 install -DpZm 0755 usr/share/%{name}/profile.sh %{buildroot}%{_prefix}/share/%{name}/profile.sh
 
 # symlinks
-ln -snf /run/issue.d/%{name}.issue %{buildroot}%{_sysconfdir}/issue.d/%{name}.issue
+ln -snf /run/%{name}/%{name}.issue %{buildroot}%{_sysconfdir}/issue.d/%{name}.issue
 # TODO(rfairley): symlink for /run/motd.d/console-login-helper-messages.motd needs to be
 # removed once upstream changes to have pam_motd.so display MOTD directly in /run
 # land
@@ -167,6 +170,9 @@ ln -snf %{_prefix}/share/%{name}/profile.sh %{buildroot}%{_sysconfdir}/profile.d
 %{_sysconfdir}/profile.d/%{name}-profile.sh
 
 %changelog
+* Wed Jan 23 2019 Robert Fairley <rfairley@redhat.com> - 0.13-3
+- change generated issue to be scoped in private directory
+
 * Wed Jan 23 2019 Robert Fairley <rfairley@redhat.com> - 0.13-2
 - change generated motd to be scoped in private directory
 
diff --git a/usr/lib/console-login-helper-messages/issuegen b/usr/lib/console-login-helper-messages/issuegen
index 66394db..cbd5f54 100755
--- a/usr/lib/console-login-helper-messages/issuegen
+++ b/usr/lib/console-login-helper-messages/issuegen
@@ -16,7 +16,10 @@ set -e
 PKG_NAME=console-login-helper-messages
 ISSUE_DIR_PUBLIC=issue.d
 ISSUE_DIR_PRIVATE=${PKG_NAME}/issue.d
-GENERATED_ISSUE=/run/${ISSUE_DIR_PUBLIC}/${PKG_NAME}.issue
+# TODO: it would be nice to have /run/issue.d be an official directory,
+#       see https://github.com/karelzak/util-linux/commit/1fc82a1360305f696dc1be6105c9c56a9ea03f52#commitcomment-27949895
+#       until then, $GENERATED_ISSUE writes to the privately scoped directory (not in /run/issue.d)
+GENERATED_ISSUE=/run/${PKG_NAME}/${PKG_NAME}.issue
 SSH_DIR=/etc/ssh
 
 # The public directories are to be read by higher-level programs to display
diff --git a/usr/lib/tmpfiles.d/console-login-helper-messages-issuegen-tmpfiles.conf b/usr/lib/tmpfiles.d/console-login-helper-messages-issuegen-tmpfiles.conf
index f93d96f..008471e 100644
--- a/usr/lib/tmpfiles.d/console-login-helper-messages-issuegen-tmpfiles.conf
+++ b/usr/lib/tmpfiles.d/console-login-helper-messages-issuegen-tmpfiles.conf
@@ -1 +1 @@
-L   /etc/issue.d/console-login-helper-messages.issue     -   -   -   -   ../../run/issue.d/console-login-helper-messages.issue
+L   /etc/issue.d/console-login-helper-messages.issue     -   -   -   -   ../../run/console-login-helper-messages/console-login-helper-messages.issue