Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

charybdis: fix motd option #109705

Merged
merged 1 commit into from Jan 18, 2021
Merged

charybdis: fix motd option #109705

merged 1 commit into from Jan 18, 2021

Conversation

nyanotech
Copy link
Contributor

@nyanotech nyanotech commented Jan 18, 2021 •
edited

Motivation for this change

without this change, it looks for the motd file in the etc/ inside the charybdis store path, so services.charybdis.motd ends up having no effect

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nyanotech
charybdis: fix motd
6a5e88d 
without this change, it looks for motd in the etc/ inside the store path, so services.charybdis.motd ends up having no effect
@ofborg ofborg bot requested review from Lassulus and fpletz January 18, 2021 05:21
@nyanotech nyanotech marked this pull request as ready for review January 18, 2021 05:21
@SuperSandro2000 SuperSandro2000 merged commit cdf147a into NixOS:master Jan 18, 2021
@nyanotech nyanotech deleted the ueitohnueit branch January 18, 2021 16:06
@Xe Xe mentioned this pull request May 31, 2021
Merged
9 tasks
github-actions bot pushed a commit that referenced this pull request Jun 15, 2021
@Xe @github-actions
solanum: fix MOTD
f5c9fcf 
Previously this defaulted to the default MOTD in the solanum source
tree, and I don't want my friends to laugh at me. Includes a patch to
the tests to ensure that the MOTD is actually set.

This replicates the fix done in #109705 (solanum is a fork of charybdis,
so they share fundamental logic for this).

Signed-off-by: Christine Dodrill <me@christine.website>
(cherry picked from commit b1fe9fa)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lassulus Lassulus Awaiting requested review from Lassulus

@fpletz fpletz Awaiting requested review from fpletz

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nyanotech @SuperSandro2000