fix: Move files from /usr/etc to /etc (#183)

Co-authored-by: Benjamin Sherman <[email protected]>
ublue-os · Aug 24, 2024 · 177d769 · 177d769
1 parent fd77d61
commit 177d769
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 1 deletion.
diff --git a/ucore/Containerfile b/ucore/Containerfile
@@ -32,7 +32,7 @@ ARG DOCKER_BUILDX_VERSION=0.12.1
 # 2.24.7 matches docker/moby 24.0.5  which FCOS ships as of 40.20240421
 ARG DOCKER_COMPOSE_VERSION=v2.24.7
 
-COPY usr /usr
+COPY system_files /
 COPY --from=docker.io/docker/buildx-bin:${DOCKER_BUILDX_VERSION} /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 COPY --from=docker.io/docker/compose-bin:${DOCKER_COMPOSE_VERSION} /docker-compose /usr/libexec/docker/cli-plugins/docker-compose
 

diff --git a/ucore/usr/etc/default/duperemove → ucore/system_files/etc/default/duperemove b/ucore/usr/etc/default/duperemove → ucore/system_files/etc/default/duperemove
diff --git a/ucore/usr/etc/sysctl.conf → ucore/system_files/etc/sysctl.conf b/ucore/usr/etc/sysctl.conf → ucore/system_files/etc/sysctl.conf
diff --git a/...sr/etc/systemd/ucore-paths-provision.conf → ...es/etc/systemd/ucore-paths-provision.conf b/...sr/etc/systemd/ucore-paths-provision.conf → ...es/etc/systemd/ucore-paths-provision.conf
diff --git a/ucore/usr/etc/systemd/zram-generator.conf → ...tem_files/etc/systemd/zram-generator.conf b/ucore/usr/etc/systemd/zram-generator.conf → ...tem_files/etc/systemd/zram-generator.conf
diff --git a/...etc/udev/rules.d/50-usb-realtek-net.rules → ...etc/udev/rules.d/50-usb-realtek-net.rules b/...etc/udev/rules.d/50-usb-realtek-net.rules → ...etc/udev/rules.d/50-usb-realtek-net.rules
diff --git a/ucore/usr/lib/systemd/system/cockpit.service → ...es/usr/lib/systemd/system/cockpit.service b/ucore/usr/lib/systemd/system/cockpit.service → ...es/usr/lib/systemd/system/cockpit.service
diff --git a/...b/systemd/system/[email protected] → ...b/systemd/system/[email protected] b/...b/systemd/system/[email protected] → ...b/systemd/system/[email protected]
diff --git a/...sr/lib/systemd/system/[email protected] → ...sr/lib/systemd/system/[email protected] b/...sr/lib/systemd/system/[email protected] → ...sr/lib/systemd/system/[email protected]
diff --git a/...temd/system/ucore-paths-provision.service → ...temd/system/ucore-paths-provision.service b/...temd/system/ucore-paths-provision.service → ...temd/system/ucore-paths-provision.service
diff --git a/.../user/distrobox-upgrade-automatic.service → .../user/distrobox-upgrade-automatic.service b/.../user/distrobox-upgrade-automatic.service → .../user/distrobox-upgrade-automatic.service
diff --git a/...md/user/distrobox-upgrade-automatic.timer → ...md/user/distrobox-upgrade-automatic.timer b/...md/user/distrobox-upgrade-automatic.timer → ...md/user/distrobox-upgrade-automatic.timer
diff --git a/ucore/usr/lib/tmpfiles.d/pcp-ucore.conf → ...m_files/usr/lib/tmpfiles.d/pcp-ucore.conf b/ucore/usr/lib/tmpfiles.d/pcp-ucore.conf → ...m_files/usr/lib/tmpfiles.d/pcp-ucore.conf
diff --git a/ucore/usr/sbin/ucore-paths-provision.sh → ...m_files/usr/sbin/ucore-paths-provision.sh b/ucore/usr/sbin/ucore-paths-provision.sh → ...m_files/usr/sbin/ucore-paths-provision.sh