fix: move /etc/ to /usr/etc/ #434

bobslept · 2023-08-22T13:16:27Z

Fixes #428

This moves all the /etc/ directories to their corresponding /usr/etc directory. We still need copy back a few files to make the builds work. Like systemd service files or repo files.

I hope this is the correct approach.

castrojo · 2023-08-22T13:18:08Z

This looks good to me but considering the change let's get a few more eyeballs on this. Thanks!

bketelsen · 2023-08-23T12:26:50Z

Looks good to me too. @castrojo I'm good with merging

bketelsen · 2023-08-23T13:24:35Z

these build errors are from the mutter-vrr package, unrelated to this PR

p5 · 2023-08-23T23:02:50Z

Containerfile

+COPY usr/etc/systemd /etc/systemd
+COPY usr/etc/yum.repos.d /etc/yum.repos.d


Would it be worth keeping both the /etc/ and /usr/ directories in the repo for easier management and understanding?

We're chucking files into /usr/etc in the repo but that's not where they end up in the image. It could be confusing when debugging issues or referencing this repo for custom images.

Or if the use-case is to store a local readonly copy of these configurations, simply:

COPY usr /usr COPY etc /etc COPY etc /usr/etc

I think the idea of having them in /usr/etc is that we can reset for a fresh start. So they have to be there for that operation. When you have them in /etc/ in the repo, chances may be that they don't end up in /usr/etc/.

They are available from that location on boot, but while building the container they are not. That is why I copy them in there explicit.

I have to let you all decide what is best, because I am not comfortable enough to make a good descision on this point. But I appreciate all the feedback. Thanks!

Jorge and others are happy with the way you've proposed, so I'm ok with it.

I just wasn't too sure of how this would be used.

Maybe this ostree deployment is where the idea also came from. In cominbation with the config reset to get a fresh start.

Besides the exceptions of /var and /etc then, the rest of the contents of the tree are checked out as hard links into the repository. It’s strongly recommended that operating systems ship all of their content in /usr, but this is not a hard requirement.

But let's see what the others have to say about. Maybe you have a very good point.

Since the build is busted anyway, would it help if we document how it should be used? I'm thinking something like "we'll ship the configs in /usr/etc so you have a copy, here's how you override a few of them, like your distrobox.ini, etc?"

Maybe this ostree deployment is where the idea also came from. In cominbation with the config reset to get a fresh start.

I think the more relevant part of the link is: https://ostreedev.github.io/ostree/deployment/#contents-of-a-deployment

The deployment should not have a traditional UNIX /etc; instead, it should include /usr/etc. This is the “default configuration”. When OSTree creates a deployment, it performs a 3-way merge using the old default configuration, the active system’s /etc, and the new default configuration. In the final filesystem tree for a deployment then, /etc is a regular writable directory.

TLDR: The idea of this PR seems good, but after moving files (in repo) from etc to usr/etc, I think it's contrary to the goal to copy any files back to /etc/* during the build.

Specifically I'm referring to lines like:

COPY usr/etc/systemd /etc/systemd COPY dx/usr/etc/yum.repos.d /etc/yum.repos.d COPY framework/usr/etc/systemd /etc/systemd

So maybe after all the best way for now is just leave the repo structure in place and just add a COPY /etc /usr/etc instead like @p5 suggested? This way we don't have to think which file goes where when doing both /etc and /usr/etc at repo level.

Or maybe even ignore this PR all together because it seems that the files we never put in /usr/etc/ at this moment are all there to have the original version of the file. Which was our first reason for doing this if i'm correct.

castrojo · 2023-08-24T14:39:03Z

I'll work on documenting this, holding this until then (or someone else beats me to it).

bobslept · 2023-08-24T15:57:22Z

I've just noticed that even without this pr there is already a copy of the file in /usr/etc/. I had edited my /etc/distrobox/distrobox.ini so it was not overwritten by a new update I did. But the new version of the file was already in /usr/etc/distrobox/distrobox.ini so I could copy that one in to restore the original one.

castrojo · 2023-08-26T01:42:09Z

ublue-os/website#404

castrojo · 2023-08-27T03:24:47Z

OK what am I doing here? Do we have concensus? 😄 I've PR'ed the docs and that's merged.

bsherman · 2023-08-27T03:43:49Z

OK what am I doing here? Do we have concensus? 😄 I've PR'ed the docs and that's merged.

I can make some specific requests to change the PR in a way which is compatible with what has been discussed and you put on the website.

bsherman · 2023-08-27T03:44:51Z

Containerfile

 COPY usr /usr
+COPY usr/etc/systemd /etc/systemd


Please remove these 2 lines:

COPY usr/etc/systemd /etc/systemd COPY usr/etc/yum.repos.d /etc/yum.repos.d

bsherman · 2023-08-27T03:45:17Z

Containerfile

 COPY dx/usr /usr
+COPY dx/usr/etc/yum.repos.d /etc/yum.repos.d


Please remove this line:

COPY dx/usr/etc/yum.repos.d /etc/yum.repos.d

bsherman · 2023-08-27T03:45:33Z

Containerfile

 COPY framework/usr /usr
+COPY framework/usr/etc/systemd /etc/systemd


Please remove this line:

COPY framework/usr/etc/systemd /etc/systemd

bsherman

I have 3 comments which are requested changes which should bring things in line with what I believe was discussed and which was published to the website.

Also, this needs to be updated from main branch.

Then I think should be good to go.

bobslept · 2023-08-27T10:39:14Z

Oh boy I think officially messed everything up now. So sorry 😢

I did run a build on my branch and getting build errors after removing those line. That was why the repo file was copied back in.

error: Packages not found: tailscale

bsherman · 2023-08-27T21:05:42Z

Oh boy I think officially messed everything up now. So sorry 😢

No worries! With git and pull requests, there is rarely an unrecoverable issue.

I have a suggestion for the current situation though. Since your PR included moving a lot of files, it's harder to merge in changes made to those files.

I suggest making a fresh new fork of bluefin repo. Immediately make the needed changes and create the PR, but also link to this one in the comment so all the lovely history is connected. :-)

I'll try to approve quickly assuming it's what I expect from the last set of comments here.

bobslept · 2023-08-27T21:36:51Z

I've created a fresh one. Lets continue this PR in #441

fix: move /etc/ to /usr/etc/

617e94f

bobslept requested a review from castrojo as a code owner August 22, 2023 13:16

bobslept enabled auto-merge August 22, 2023 13:16

castrojo previously approved these changes Aug 23, 2023

View reviewed changes

bobslept added this pull request to the merge queue Aug 23, 2023

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 23, 2023

castrojo added this pull request to the merge queue Aug 23, 2023

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 23, 2023

p5 reviewed Aug 23, 2023

View reviewed changes

castrojo marked this pull request as draft August 24, 2023 14:39

bsherman reviewed Aug 27, 2023

View reviewed changes

bsherman requested changes Aug 27, 2023

View reviewed changes

KyleGospo and others added 5 commits August 27, 2023 12:27

fix: Replace new mutter-common package (#435)

ccb5563

feat: add fedora image (#436)

d75792e

fix(framework): added wallpaper xml (#438)

a72fa89

fix(dx): use distrobox-enter wrapper for non default images (#439)

09a64ab

remove lines

f443e93

bobslept dismissed castrojo’s stale review via f443e93 August 27, 2023 10:28

bobslept mentioned this pull request Aug 27, 2023

fix: move /etc/ to /usr/etc/ #441

Merged

bobslept closed this Aug 27, 2023

bobslept deleted the fix-location-configs branch August 28, 2023 14:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: move /etc/ to /usr/etc/ #434

fix: move /etc/ to /usr/etc/ #434

bobslept commented Aug 22, 2023

castrojo commented Aug 22, 2023

bketelsen commented Aug 23, 2023

bketelsen commented Aug 23, 2023

p5 Aug 23, 2023 •

edited

Loading

bobslept Aug 23, 2023 •

edited

Loading

p5 Aug 23, 2023

bobslept Aug 23, 2023 •

edited

Loading

castrojo Aug 23, 2023

bsherman Aug 26, 2023

bobslept Aug 26, 2023

castrojo commented Aug 24, 2023 •

edited

Loading

bobslept commented Aug 24, 2023

castrojo commented Aug 26, 2023

castrojo commented Aug 27, 2023

bsherman commented Aug 27, 2023

bsherman Aug 27, 2023

bsherman Aug 27, 2023

bsherman Aug 27, 2023

bsherman left a comment

bobslept commented Aug 27, 2023 •

edited

Loading

bsherman commented Aug 27, 2023

bobslept commented Aug 27, 2023

		COPY usr/etc/systemd /etc/systemd
		COPY usr/etc/yum.repos.d /etc/yum.repos.d

		COPY dx/usr /usr
		COPY dx/usr/etc/yum.repos.d /etc/yum.repos.d

		COPY framework/usr /usr
		COPY framework/usr/etc/systemd /etc/systemd

fix: move /etc/ to /usr/etc/ #434

fix: move /etc/ to /usr/etc/ #434

Conversation

bobslept commented Aug 22, 2023

castrojo commented Aug 22, 2023

bketelsen commented Aug 23, 2023

bketelsen commented Aug 23, 2023

p5 Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

bobslept Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

p5 Aug 23, 2023

Choose a reason for hiding this comment

bobslept Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

castrojo Aug 23, 2023

Choose a reason for hiding this comment

bsherman Aug 26, 2023

Choose a reason for hiding this comment

bobslept Aug 26, 2023

Choose a reason for hiding this comment

castrojo commented Aug 24, 2023 • edited Loading

bobslept commented Aug 24, 2023

castrojo commented Aug 26, 2023

castrojo commented Aug 27, 2023

bsherman commented Aug 27, 2023

bsherman Aug 27, 2023

Choose a reason for hiding this comment

bsherman Aug 27, 2023

Choose a reason for hiding this comment

bsherman Aug 27, 2023

Choose a reason for hiding this comment

bsherman left a comment

Choose a reason for hiding this comment

bobslept commented Aug 27, 2023 • edited Loading

bsherman commented Aug 27, 2023

bobslept commented Aug 27, 2023

p5 Aug 23, 2023 •

edited

Loading

bobslept Aug 23, 2023 •

edited

Loading

bobslept Aug 23, 2023 •

edited

Loading

castrojo commented Aug 24, 2023 •

edited

Loading

bobslept commented Aug 27, 2023 •

edited

Loading