hooks: update motd handling and remove 50-motd-news#118
Open
mvo5 wants to merge 3 commits intocanonical:masterfrom
Open
hooks: update motd handling and remove 50-motd-news#118mvo5 wants to merge 3 commits intocanonical:masterfrom
mvo5 wants to merge 3 commits intocanonical:masterfrom
Conversation
The base-files package grew a new /etc/update-motd.d/50-motd-news script during the lifetime of Core 16. This script wants to write to the non-writable /var/cache/motd-news location and also needs curl to work. So it fails and that leads to breaking the /etc/update-motd.d/00-header script. This commit disables the script and also adds a check to ensure that no new files are added to /etc/update-motd.d without us noticing.
mvo5
force-pushed
the
motd-extra-careful
branch
from
e8ef7ea to
0cb5b93
Compare
The update to base-files in LP:1888575 leaves an empty
/etc/default/motd-news.wasremoved
file around. This file is not needed and also misleading
because the file was never around so it was never removed.
See
https://bugs.launchpad.net/ubuntu/+source/base-files/+bug/1888575/comments/21
for more details.
This commit just removes this (empty) file.
pedronis
reviewed
Sep 7, 2020
live-build/hooks/14-set-motd.chroot
Outdated
| rm /etc/update-motd.d/10-help-text | ||
|
|
||
| # fail if anything in update-motd.d changed so that we can inspect/update | ||
| if [ "$(find /etc/update-motd.d/ -type f | wc -l)" != 2 ]; then |
Collaborator
There was a problem hiding this comment.
this is not quite a content change check, if a file is replaced it will pass
Contributor
Author
There was a problem hiding this comment.
Indeed, thanks for this! I updated the test now to actually look at the content.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The base-files package grew a new /etc/update-motd.d/50-motd-news
script during the lifetime of Core 16. This script wants to write
to the non-writable /var/cache/motd-news location and also needs
curl to work. So it fails and that leads to breaking the
/etc/update-motd.d/00-header script.
This commit disables the script and also adds a check to ensure
that no new files are added to /etc/update-motd.d without us
noticing.