-
Notifications
You must be signed in to change notification settings - Fork 63
Fix cups tmpfiles, and move the snippet under desktop profile #173
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.
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
Open
cvlc12
wants to merge
1
commit into
systemd:main
Choose a base branch
from
cvlc12:fix_cups
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
6 changes: 6 additions & 0 deletions
6
mkosi.profiles/desktop/mkosi.extra/usr/lib/tmpfiles.d/cups.conf
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # CUPS fails if the configs are missing but needs write access in /etc/cups/ | ||
| d /etc/cups 0755 root root - | ||
| L? /etc/cups/cupsd.conf | ||
| L? /etc/cups/cups-files.conf | ||
| L? /etc/cups/snmp.conf | ||
| L? /etc/cups/cups-pdf.conf | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This means every time a new config file is added, this gets out of date. Better to just keep the directory symlink, until they support hermetic-usr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you do about #170 then ? You can't add printers right now. Might as well get rid of cups.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use
Cas the comment there indicated?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't that mean that the default files stop tracking upstream changes ? Doesn't C only "run once" since it will skip copying over existing files ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes but it's getting out of date anyway, and with C blasting the directory and rebooting is enough to get an up to date copy, while linking individual files means a new os version is needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If a new file gets added, the tmpfiles needs to change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this likely though ? It didn't think so but I'll trust you on this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given this identical tmpfiles.d is used across many different distributions and versions, it seems plausible it could happen
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So basically in one case it's up to particleOS to keep the tmpfiles updated, and in another it's up to users to clear their /etc/cups once in a while (and lose installed printers) to keep track of changes I guess ?
I guess I still think that this PR's solution is better but 🤷
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be fair this very rarely happens, the main config files for cups have been the same for as long as I can remember, though the above list could probably also include
client.confandcups-browsed.conf. But all in all, this is a finite list one can get right.Maybe a tmpfiles could do with a directive that creates a symlink for every member of a directory.