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.

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

chore: Put files in /etc/ instead in /usr/etc #315

Merged
merged 6 commits into from
Aug 11, 2024
Merged

chore: Put files in /etc/ instead in /usr/etc #315

merged 6 commits into from
Aug 11, 2024

Conversation

fiftydinar
Copy link
Collaborator

@fiftydinar fiftydinar commented Aug 8, 2024

This modifies build-time part of modules to work with /etc/ instead of /usr/etc/

Related PR:
blue-build/template#38
blue-build/website#65

This also modifies build-time part of modules to work with `/etc/` instead of `/usr/etc/`
@fiftydinar fiftydinar requested a review from xynydev as a code owner August 8, 2024 15:51
@fiftydinar fiftydinar changed the title docs(files): Recommend to put files in /etc/ instead in ` docs(files): Recommend to put files in /etc/ instead in /usr/etc Aug 8, 2024
modules/files/README.md Outdated Show resolved Hide resolved
@fiftydinar fiftydinar changed the title docs(files): Recommend to put files in /etc/ instead in /usr/etc chore: Recommend to put files in /etc/ instead in /usr/etc Aug 8, 2024
@fiftydinar fiftydinar changed the title chore: Recommend to put files in /etc/ instead in /usr/etc chore: Put files in /etc/ instead in /usr/etc Aug 8, 2024
@fiftydinar
Copy link
Collaborator Author

I think that this needs to be tested for regressions, since I couldn't copy to /etc/hosts, but could to /usr/etc/hosts in my image unrelated to this PR.

The error I got was Read-only filesystem

@xynydev
Copy link
Member

xynydev commented Aug 10, 2024

I think that this needs to be tested for regressions

Is this OK to merge then or do we need to do something first?

@fiftydinar
Copy link
Collaborator Author

fiftydinar commented Aug 10, 2024

I think that this needs to be tested for regressions

Is this OK to merge then or do we need to do something first?

Have to test all modules for regression, but signing module the most.

Since Ublue images don't copy policy.json to /etc/ in build-time as an exception (they have issues with ublue-os-signing RPM clashing with containers-common RPM policy.json)
ublue-os/config#311

@fiftydinar
Copy link
Collaborator Author

fiftydinar commented Aug 10, 2024

There is a regression in signing module right now:

I get this error:

#51 0.081 cp: cannot stat '/usr/share/ublue-os/cosign.pub': No such file or directory

When reverting to the current signing module state, it works again.

Everything else works.

The workaround is to keep signing module copying to /usr/etc/ temporarily (as it is), until Ublue solves this issue

EDIT: Done the workaround

@fiftydinar
Copy link
Collaborator Author

fiftydinar commented Aug 10, 2024

This is ready to merge now (when other PRs get approved too)

@gmpinder
Copy link
Member

I think the signing module is busted until this gets merged in BTW

@fiftydinar
Copy link
Collaborator Author

@xynydev CLI is ready, time to merge stuff

@xynydev xynydev merged commit 59c7882 into blue-build:main Aug 11, 2024
xynydev pushed a commit to blue-build/template that referenced this pull request Aug 11, 2024
* chore: Recommend the usage of `/etc/` instead of `/usr/etc/`

Related PR:
blue-build/modules#315

* docs: Remove mention of putting files to `/usr/etc/` in recipe
@fiftydinar fiftydinar deleted the usr-etc-docs branch August 11, 2024 17:09
davemccrea pushed a commit to davemccrea/davidos that referenced this pull request Aug 20, 2024
* chore: Recommend the usage of `/etc/` instead of `/usr/etc/`

Related PR:
blue-build/modules#315

* docs: Remove mention of putting files to `/usr/etc/` in recipe
vietchinh pushed a commit to vietchinh/ubluelight that referenced this pull request Dec 20, 2024
* chore: Recommend the usage of `/etc/` instead of `/usr/etc/`

Related PR:
blue-build/modules#315

* docs: Remove mention of putting files to `/usr/etc/` in recipe

(cherry picked from commit fa30038613a4b455c32a8115df2ca6ee4837097e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants