From 71d0d5cbc7fd23ed67ee7d0770c74c6fcba4102c Mon Sep 17 00:00:00 2001 From: Robert Fairley Date: Jan 24 2019 17:22:22 +0000 Subject: update reviewers.md and manual.md with correct paths --- diff --git a/console-login-helper-messages.spec b/console-login-helper-messages.spec index 1e8d757..7578fd1 100644 --- a/console-login-helper-messages.spec +++ b/console-login-helper-messages.spec @@ -3,7 +3,7 @@ Name: console-login-helper-messages Version: 0.13 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Combines motd, issue, profile features to show system information to the user before/on login License: BSD URL: https://github.com/%{github_owner}/%{github_project} @@ -170,6 +170,9 @@ ln -snf %{_prefix}/share/%{name}/profile.sh %{buildroot}%{_sysconfdir}/profile.d %{_sysconfdir}/profile.d/%{name}-profile.sh %changelog +* Thu Jan 24 2019 Robert Fairley - 0.13-4 +- update reviewers.md and manual.md with correct paths + * Wed Jan 23 2019 Robert Fairley - 0.13-3 - change generated issue to be scoped in private directory diff --git a/manual.md b/manual.md index 88a3e2b..ffc5593 100644 --- a/manual.md +++ b/manual.md @@ -11,17 +11,6 @@ The following packages/subpackages provide the following functions: | console-login-helper-messages-motdgen | messages shown using the motd paths after SSH in (system information) | | console-login-helper-messages-profile | messages shown using /etc/profile.d script, shown on login to bash terminal (failed systemd units) | -## Note on upstream dependencies - -issuegen/motdgen rely on upstream features from packages such as PAM and agetty, to locate the issue/motd files and display them. The table below gives the earliest package version that the -needed features are given in. - -| package | fc28 | stable? | fc29 | stable? | -| ------------------------------------- | ---- | ------- | ---- | ------- | -| pam (for sshd which uses pam_motd.so) | 1.3.1-15 | Y | 1.3.1-15 | Y | -| selinux-policy (permissions under /run) | 3.14.3-14 | N | 3.14.3-14 | N | -| util-linux (aggetty to display /etc/issue.d) | 2.32-1 | Y | 2.32-1 | Y | - ## Common operations ### Enabling messages @@ -29,7 +18,11 @@ needed features are given in. The following enables the `motd` and `issue` messages to show at boot: ``` -systemctl enable issuegen.path issuegen.service motdgen.path motdgen.service +systemctl enable \ + console-login-helper-messages-issuegen.path \ + console-login-helper-messages-issuegen.service \ + console-login-helper-messages-motdgen.path \ + console-login-helper-messages-motdgen.service ``` The `profile` messages are enabled by default by a symlink from `/etc/profile.d` at install. @@ -39,19 +32,16 @@ The `profile` messages are enabled by default by a symlink from `/etc/profile.d` - To have a message appended to the same `motd` file generated by `motdgen.service`, the files to append can be dropped in `/etc/console-login-helper-messages/motd.d` or `/run/console-login-helper-messages/motd.d` - Similarly, `issue` messages to append to the same `issue` file generated by `issuegen.service` can be dropped in `/etc/console-login-helper-messages/issue.d` or or `/run/console-login-helper-messages/issue.d` -There is also functionality provided already in Fedora 28 and 29 by pam_motd.so [0] (used by sshd), and agetty [1], -which can accomplish displaying an additional message without needing to use the `console-login-helper-messages` -directories mentioned above. - -- [0] https://www.mankier.com/8/pam_motd#Description -- [1] https://www.mankier.com/8/agetty#Issue_Files - ### Disabling messages The following disables the `motd` and `issue` messages from showing: ``` -systemctl disable issuegen.path issuegen.service motdgen.path motdgen.service +systemctl disable \ + console-login-helper-messages-issuegen.path \ + console-login-helper-messages-issuegen.service \ + console-login-helper-messages-motdgen.path \ + console-login-helper-messages-motdgen.service ``` The `profile` messages can be disabled only by uninstalling `console-login-helper-messages-profile`. @@ -60,8 +50,7 @@ The `profile` messages can be disabled only by uninstalling `console-login-helpe Messages can be silenced, but not disabled from being generated. -- The generated `motd` by `motdgen.service` may be silenced or overridden by placing a file at `/etc/motd.d/console-login-helper-messages.motd`. A symlink to `/dev/null` can also be used for silencing. -- Currently, the `issue` generated by `issuegen.service` can be silenced only by uninstalling `console-login-helper-messages-issuegen`. +- Currently, the `issue`/`motd` generated by `console-login-helper-messages-issuegen.service`/`console-login-helper-messages-motdgen.service` can be silenced only by uninstalling `console-login-helper-messages-issuegen`/`console-login-helper-messages-motdgen`. ### Recreating the symlinks @@ -76,6 +65,6 @@ systemd-tmpfiles --create To manually regenerate the `motd` or `issue`, the following commands can be used respectively: ``` -systemctl restart motdgen.service -systemctl restart issuegen.service +systemctl restart console-login-helper-messages-motdgen.service +systemctl restart console-login-helper-messages-issuegen.service ``` diff --git a/reviewers.md b/reviewers.md index 30936af..4102b9c 100644 --- a/reviewers.md +++ b/reviewers.md @@ -13,14 +13,14 @@ may be used to automatically enable the COPR repo and install the packages. - [x] The MOTD was generated - $ cat /run/motd.d/console-login-helper-messages.motd + $ cat /run/console-login-helper-messages/console-login-helper-messages.motd Fedora (29 (Cloud Edition)) - [x] The issue symlink was created and issue generated $ ls -l /etc/issue.d/console-login-helper-messages.issue - lrwxrwxrwx. 1 root root 48 Dec 10 20:12 /etc/issue.d/console-login-helper-messages.issue -> /run/issue.d/console-login-helper-messages.issue - $ cat /run/issue.d/console-login-helper-messages.issue + lrwxrwxrwx. 1 root root 48 Dec 10 20:12 /etc/issue.d/console-login-helper-messages.issue -> /run/console-login-helper-messages/console-login-helper-messages.issue + $ cat /run/console-login-helper-messages/console-login-helper-messages.issue This is \n (\s \m \r) \t SSH host key: SHA256:0n7Zlbmhnjr7P+pNA2hYM0MPmdmPBNnGQ+I90Q1Dwgk (ECDSA) SSH host key: SHA256:FUpLCL6eYYCT5s2izSxGvwaE6lEqjp3GO34UEa7G/UQ (ED25519) @@ -56,7 +56,7 @@ may be used to automatically enable the COPR repo and install the packages. # echo "hello" > /run/console-login-helper-messages/motd.d/00_hello # systemctl restart console-login-helper-messages-motdgen.service - # cat /run/motd.d/console-login-helper-messages.motd + # cat /run/console-login-helper-messages/console-login-helper-messages.motd Fedora (29 (Cloud Edition)) hello