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

ublue-os · Aug 28, 2023 · 1484594 · 1484594
1 parent 8a9179b
commit 1484594
Show file tree

Hide file tree

Showing 19 changed files with 3 additions and 5 deletions.
diff --git a/Containerfile b/Containerfile
@@ -10,8 +10,8 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
-COPY etc /etc
 COPY usr /usr
+COPY etc/yum.repos.d/ /etc/yum.repos.d/
 
 COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign
 
@@ -24,8 +24,6 @@ ADD build.sh /tmp/build.sh
 
 RUN /tmp/build.sh && \
     pip install --prefix=/usr yafti && \
-    systemctl unmask dconf-update.service && \
-    systemctl enable dconf-update.service && \
     systemctl enable rpm-ostree-countme.service && \
     systemctl enable tailscaled.service && \
     fc-cache -f /usr/share/fonts/ubuntu && \
@@ -51,8 +49,8 @@ ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
 # dx specific files come from the dx directory in this repo
-COPY dx/etc /etc
 COPY dx/usr /usr
+COPY dx/etc/yum.repos.d/ /etc/yum.repos.d/
 COPY workarounds.sh /tmp/workarounds.sh
 
 RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
@@ -112,7 +110,6 @@ RUN ostree container commit
 # Image for Framework laptops
 FROM bluefin AS bluefin-framework
 
-COPY framework/etc /etc
 COPY framework/usr /usr
 
 RUN rpm-ostree install tlp tlp-rdw stress-ng

diff --git a/dx/etc/dconf/db/local.d/01-ublue-dx → dx/usr/etc/dconf/db/local.d/01-ublue-dx b/dx/etc/dconf/db/local.d/01-ublue-dx → dx/usr/etc/dconf/db/local.d/01-ublue-dx
diff --git a/dx/etc/distrobox/distrobox.ini → dx/usr/etc/distrobox/distrobox.ini b/dx/etc/distrobox/distrobox.ini → dx/usr/etc/distrobox/distrobox.ini
diff --git a/...k/etc/dconf/db/local.d/01-ublue-framework → ...r/etc/dconf/db/local.d/01-ublue-framework b/...k/etc/dconf/db/local.d/01-ublue-framework → ...r/etc/dconf/db/local.d/01-ublue-framework
diff --git a/framework/etc/systemd/system/fprintd.service → ...rk/usr/etc/systemd/system/fprintd.service b/framework/etc/systemd/system/fprintd.service → ...rk/usr/etc/systemd/system/fprintd.service
diff --git a/framework/etc/tlp.d/50-framework.conf → framework/usr/etc/tlp.d/50-framework.conf b/framework/etc/tlp.d/50-framework.conf → framework/usr/etc/tlp.d/50-framework.conf
diff --git a/etc/dconf/db/gdm.d/01-ublue → usr/etc/dconf/db/gdm.d/01-ublue b/etc/dconf/db/gdm.d/01-ublue → usr/etc/dconf/db/gdm.d/01-ublue
diff --git a/etc/dconf/db/local.d/01-ublue → usr/etc/dconf/db/local.d/01-ublue b/etc/dconf/db/local.d/01-ublue → usr/etc/dconf/db/local.d/01-ublue
diff --git a/etc/dconf/profile/gdm → usr/etc/dconf/profile/gdm b/etc/dconf/profile/gdm → usr/etc/dconf/profile/gdm
diff --git a/etc/dconf/profile/user → usr/etc/dconf/profile/user b/etc/dconf/profile/user → usr/etc/dconf/profile/user
diff --git a/etc/distrobox/distrobox.conf → usr/etc/distrobox/distrobox.conf b/etc/distrobox/distrobox.conf → usr/etc/distrobox/distrobox.conf
diff --git a/etc/distrobox/distrobox.ini → usr/etc/distrobox/distrobox.ini b/etc/distrobox/distrobox.ini → usr/etc/distrobox/distrobox.ini
diff --git a/etc/environment → usr/etc/environment b/etc/environment → usr/etc/environment
diff --git a/etc/profile.d/bluefin-firstboot.sh → usr/etc/profile.d/bluefin-firstboot.sh b/etc/profile.d/bluefin-firstboot.sh → usr/etc/profile.d/bluefin-firstboot.sh
diff --git a/etc/profile.d/nix-app-icons.sh → usr/etc/profile.d/nix-app-icons.sh b/etc/profile.d/nix-app-icons.sh → usr/etc/profile.d/nix-app-icons.sh
diff --git a/...onfig/autostart/bluefin-firstboot.desktop → ...onfig/autostart/bluefin-firstboot.desktop b/...onfig/autostart/bluefin-firstboot.desktop → ...onfig/autostart/bluefin-firstboot.desktop
diff --git a/etc/systemd/system/dconf-update.service → usr/etc/systemd/system/dconf-update.service b/etc/systemd/system/dconf-update.service → usr/etc/systemd/system/dconf-update.service
diff --git a/etc/yafti.yml → usr/etc/yafti.yml b/etc/yafti.yml → usr/etc/yafti.yml
diff --git a/usr/lib/systemd/system-preset/95-dconf-update.preset b/usr/lib/systemd/system-preset/95-dconf-update.preset
@@ -0,0 +1 @@
+enable dconf-update.service