From b6421473c48e57d4e533bccc2d54191eced2a13e Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 7 Aug 2024 20:58:08 -0700 Subject: [PATCH 1/3] fix: Move files in /usr/etc to /etc, adding files to /usr/etc is considered undefined behavior --- build_files/aurora-changes.sh | 2 +- build_files/branding-dx.sh | 4 +-- build_files/branding.sh | 4 +-- build_files/build-base.sh | 2 +- build_files/fetch-install.sh | 2 +- build_files/fetch-quadlets.sh | 34 +++++++++---------- .../etc/profile.d/vscode-bluefin-profile.sh | 0 .../etc/skel/.config/Code/User/settings.json | 0 .../{usr => }/etc/dconf/db/local.d/01-ptyxis | 0 .../etc/profile.d/aurora-fastfetch.sh | 0 .../{usr => }/etc/profile.d/ksshaskpass.sh | 0 .../etc/skel/.config/gtk-4.0/gtk.css | 0 .../.config/gtk-4.0/kde_window_geometry.css | 0 .../{usr => }/etc/xdg/kcm-about-distrorc | 0 .../kinoite/{usr => }/etc/xdg/kdeglobals | 0 .../kinoite/{usr => }/etc/xdg/krunnerrc | 0 system_files/kinoite/{usr => }/etc/xdg/kwinrc | 0 .../{usr => }/etc/distrobox/distrobox.conf | 0 .../{usr => }/etc/distrobox/distrobox.example | 0 .../shared/{usr => }/etc/profile.d/askpass.sh | 0 .../etc/profile.d/bluefin-firstboot.sh | 0 .../etc/profile.d/brew-bash-completion.sh | 0 .../{usr => }/etc/profile.d/neofetch.sh | 0 .../shared/{usr => }/etc/profile.d/open.sh | 0 .../etc/security/limits.d/30-brew-limits.conf | 0 .../autostart/bluefin-firstboot.desktop | 0 .../skel/.config/toolbox/host-welcome-shown | 0 .../share/flatpak/overrides/com.google.Chrome | 0 .../flatpak/overrides/com.visualstudio.code | 0 .../palettes/catppuccin-dynamic.palette | 0 .../config/glib-2.0/settings/keyfile | 0 .../shared/{usr => }/etc/systemd/user.conf | 0 .../etc/ublue-update/ublue-update.toml | 0 system_files/shared/{usr => }/etc/yafti.yml | 0 system_files/shared/{usr => }/etc/zsh/zlogin | 0 system_files/shared/{usr => }/etc/zsh/zlogout | 0 .../shared/{usr => }/etc/zsh/zprofile | 0 system_files/shared/{usr => }/etc/zsh/zshenv | 0 system_files/shared/{usr => }/etc/zsh/zshrc | 0 .../systemd/system/ublue-etc-merge.service | 2 +- .../shared/usr/libexec/ublue-user-setup | 2 +- .../{usr => }/etc/dconf/db/gdm.d/01-ublue | 0 .../{usr => }/etc/dconf/db/local.d/01-ublue | 0 .../etc/dconf/db/local.d/02-bluefin-folders | 0 .../etc/dconf/db/local.d/locks/01-ublue-lock | 0 .../{usr => }/etc/dconf/profile/gdm | 0 .../{usr => }/etc/dconf/profile/user | 0 .../silverblue/{usr => }/etc/environment | 0 .../etc/profile.d/bluefin-fastfetch.sh | 0 49 files changed, 26 insertions(+), 26 deletions(-) rename system_files/dx/{usr => }/etc/profile.d/vscode-bluefin-profile.sh (100%) rename system_files/dx/{usr => }/etc/skel/.config/Code/User/settings.json (100%) rename system_files/kinoite/{usr => }/etc/dconf/db/local.d/01-ptyxis (100%) rename system_files/kinoite/{usr => }/etc/profile.d/aurora-fastfetch.sh (100%) rename system_files/kinoite/{usr => }/etc/profile.d/ksshaskpass.sh (100%) rename system_files/kinoite/{usr => }/etc/skel/.config/gtk-4.0/gtk.css (100%) rename system_files/kinoite/{usr => }/etc/skel/.config/gtk-4.0/kde_window_geometry.css (100%) rename system_files/kinoite/{usr => }/etc/xdg/kcm-about-distrorc (100%) rename system_files/kinoite/{usr => }/etc/xdg/kdeglobals (100%) rename system_files/kinoite/{usr => }/etc/xdg/krunnerrc (100%) rename system_files/kinoite/{usr => }/etc/xdg/kwinrc (100%) rename system_files/shared/{usr => }/etc/distrobox/distrobox.conf (100%) rename system_files/shared/{usr => }/etc/distrobox/distrobox.example (100%) rename system_files/shared/{usr => }/etc/profile.d/askpass.sh (100%) rename system_files/shared/{usr => }/etc/profile.d/bluefin-firstboot.sh (100%) rename system_files/shared/{usr => }/etc/profile.d/brew-bash-completion.sh (100%) rename system_files/shared/{usr => }/etc/profile.d/neofetch.sh (100%) rename system_files/shared/{usr => }/etc/profile.d/open.sh (100%) rename system_files/shared/{usr => }/etc/security/limits.d/30-brew-limits.conf (100%) rename system_files/shared/{usr => }/etc/skel/.config/autostart/bluefin-firstboot.desktop (100%) rename system_files/shared/{usr => }/etc/skel/.config/toolbox/host-welcome-shown (100%) rename system_files/shared/{usr => }/etc/skel/.local/share/flatpak/overrides/com.google.Chrome (100%) rename system_files/shared/{usr => }/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code (100%) rename system_files/shared/{usr => }/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette (100%) rename system_files/shared/{usr => }/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile (100%) rename system_files/shared/{usr => }/etc/systemd/user.conf (100%) rename system_files/shared/{usr => }/etc/ublue-update/ublue-update.toml (100%) rename system_files/shared/{usr => }/etc/yafti.yml (100%) rename system_files/shared/{usr => }/etc/zsh/zlogin (100%) rename system_files/shared/{usr => }/etc/zsh/zlogout (100%) rename system_files/shared/{usr => }/etc/zsh/zprofile (100%) rename system_files/shared/{usr => }/etc/zsh/zshenv (100%) rename system_files/shared/{usr => }/etc/zsh/zshrc (100%) rename system_files/silverblue/{usr => }/etc/dconf/db/gdm.d/01-ublue (100%) rename system_files/silverblue/{usr => }/etc/dconf/db/local.d/01-ublue (100%) rename system_files/silverblue/{usr => }/etc/dconf/db/local.d/02-bluefin-folders (100%) rename system_files/silverblue/{usr => }/etc/dconf/db/local.d/locks/01-ublue-lock (100%) rename system_files/silverblue/{usr => }/etc/dconf/profile/gdm (100%) rename system_files/silverblue/{usr => }/etc/dconf/profile/user (100%) rename system_files/silverblue/{usr => }/etc/environment (100%) rename system_files/silverblue/{usr => }/etc/profile.d/bluefin-fastfetch.sh (100%) diff --git a/build_files/aurora-changes.sh b/build_files/aurora-changes.sh index c14462ef818..2be533c9ba4 100755 --- a/build_files/aurora-changes.sh +++ b/build_files/aurora-changes.sh @@ -17,7 +17,7 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then sed -i 's@Bluefin@Aurora@g' /usr/share/applications/system-update.desktop sed -i 's@Bluefin@Aurora@g' /usr/share/ublue-os/motd/tips/10-tips.md sed -i 's@Bluefin@Aurora@g' /usr/libexec/ublue-flatpak-manager - rm -f /usr/etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in + rm -f /etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop systemctl enable kde-sysmonitor-workaround.service fi diff --git a/build_files/branding-dx.sh b/build_files/branding-dx.sh index 5400a4efc52..7a99b83ce06 100755 --- a/build_files/branding-dx.sh +++ b/build_files/branding-dx.sh @@ -4,9 +4,9 @@ set -ouex pipefail if test "$BASE_IMAGE_NAME" = "silverblue"; then sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release - sed -i 's/Bluefin/Bluefin-dx/' /usr/etc/yafti.yml + sed -i 's/Bluefin/Bluefin-dx/' /etc/yafti.yml elif test "$BASE_IMAGE_NAME" = "kinoite"; then sed -i '/^PRETTY_NAME/s/Aurora/Aurora-dx/' /usr/lib/os-release - sed -i 's/Aurora/Aurora-dx/' /usr/etc/yafti.yml + sed -i 's/Aurora/Aurora-dx/' /etc/yafti.yml sed -i 's/Aurora/Aurora-DX/' /usr/share/kde-settings/kde-profile/default/xdg/kcm-about-distrorc fi diff --git a/build_files/branding.sh b/build_files/branding.sh index 701cfce42d2..76ba0fbc937 100755 --- a/build_files/branding.sh +++ b/build_files/branding.sh @@ -7,8 +7,8 @@ if test "$BASE_IMAGE_NAME" = "silverblue"; then sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release elif test "$BASE_IMAGE_NAME" = "kinoite"; then sed -i '/^PRETTY_NAME/s/Kinoite/Aurora/' /usr/lib/os-release - sed -i 's/Bluefin/Aurora/g' /usr/etc/yafti.yml - sed -i 's/Aurora (Beta)/Aurora \- Bluefin\-KDE (Alpha)/' /usr/etc/yafti.yml + sed -i 's/Bluefin/Aurora/g' /etc/yafti.yml + sed -i 's/Aurora (Beta)/Aurora \- Bluefin\-KDE (Alpha)/' /etc/yafti.yml sed -i 's/Bluefin/Aurora/' /usr/libexec/ublue-flatpak-manager fi diff --git a/build_files/build-base.sh b/build_files/build-base.sh index dce95345521..0581a46ad65 100755 --- a/build_files/build-base.sh +++ b/build_files/build-base.sh @@ -5,7 +5,7 @@ set -ouex pipefail cp -r /ctx/just /tmp/just cp /ctx/packages.json /tmp/packages.json -cp /ctx/system_files/shared/usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml +cp /ctx/system_files/shared/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml rsync -rvK /ctx/system_files/shared/ / rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ / diff --git a/build_files/fetch-install.sh b/build_files/fetch-install.sh index 94a2519b440..7c3c948889b 100755 --- a/build_files/fetch-install.sh +++ b/build_files/fetch-install.sh @@ -23,4 +23,4 @@ rpm-ostree install ublue-update find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just # Copy over ublue-update config -cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml +cp /tmp/ublue-update.toml /etc/ublue-update/ublue-update.toml diff --git a/build_files/fetch-quadlets.sh b/build_files/fetch-quadlets.sh index 99816f08ecc..93689f5c2da 100755 --- a/build_files/fetch-quadlets.sh +++ b/build_files/fetch-quadlets.sh @@ -3,35 +3,35 @@ set -ouex pipefail # Make Directory -mkdir -p /usr/etc/containers/systemd/users +mkdir -p /etc/containers/systemd/users # bluefin-cli -curl -Lo /usr/etc/containers/systemd/users/bluefin-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container -sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /usr/etc/containers/systemd/users/bluefin-cli.container +curl -Lo /etc/containers/systemd/users/bluefin-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-cli.container +sed -i 's/ContainerName=bluefin/ContainerName=bluefin-cli/' /etc/containers/systemd/users/bluefin-cli.container # bluefin-dx-cli -curl -Lo /usr/etc/containers/systemd/users/bluefin-dx-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container -sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /usr/etc/containers/systemd/users/bluefin-dx-cli.container +curl -Lo /etc/containers/systemd/users/bluefin-dx-cli.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/bluefin-cli/bluefin-dx-cli.container +sed -i 's/ContainerName=bluefin/ContainerName=bluefin-dx-cli/' /etc/containers/systemd/users/bluefin-dx-cli.container # fedora-toolbox -curl -Lo /usr/etc/containers/systemd/users/fedora-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container -sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /usr/etc/containers/systemd/users/fedora-toolbox.container +curl -Lo /etc/containers/systemd/users/fedora-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container +sed -i 's/ContainerName=fedora-distrobox-quadlet/ContainerName=fedora-toolbox/' /etc/containers/systemd/users/fedora-toolbox.container # ubuntu-toolbox -curl -Lo /usr/etc/containers/systemd/users/ubuntu-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container -sed -i 's/ContainerName=ubuntu-distrobox-quadlet/ContainerName=ubuntu-toolbox/' /usr/etc/containers/systemd/users/ubuntu-toolbox.container +curl -Lo /etc/containers/systemd/users/ubuntu-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container +sed -i 's/ContainerName=ubuntu-distrobox-quadlet/ContainerName=ubuntu-toolbox/' /etc/containers/systemd/users/ubuntu-toolbox.container # wolfi-toolbox -curl -Lo /usr/etc/containers/systemd/users/wolfi-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container -sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-toolbox/' /usr/etc/containers/systemd/users/wolfi-toolbox.container +curl -Lo /etc/containers/systemd/users/wolfi-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container +sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-toolbox/' /etc/containers/systemd/users/wolfi-toolbox.container # wolfi-dx-toolbox -curl -Lo /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container -sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-dx-toolbox/' /usr/etc/containers/systemd/users/wolfi-dx-toolbox.container +curl -Lo /etc/containers/systemd/users/wolfi-dx-toolbox.container https://raw.githubusercontent.com/ublue-os/toolboxes/main/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container +sed -i 's/ContainerName=wolfi-quadlet/ContainerName=wolfi-dx-toolbox/' /etc/containers/systemd/users/wolfi-dx-toolbox.container # Brew Integration for Fedora and Ubuntu Toolboxes -printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/usr/etc/profile.d/brew.sh:/etc/profile.d/brew.sh:ro\nVolume=/usr/share/fish/vendor_conf.d/brew.fish:/usr/share/fish/vendor_conf.d/brew.fish:ro\n" >> /usr/etc/containers/systemd/users/ubuntu-toolbox.container -printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/usr/etc/profile.d/brew.sh:/etc/profile.d/brew.sh:ro\nVolume=/usr/share/fish/vendor_conf.d/brew.fish:/usr/share/fish/vendor_conf.d/brew.fish:ro\n" >> /usr/etc/containers/systemd/users/fedora-toolbox.container +printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/etc/profile.d/brew.sh:/etc/profile.d/brew.sh:ro\nVolume=/usr/share/fish/vendor_conf.d/brew.fish:/usr/share/fish/vendor_conf.d/brew.fish:ro\n" >> /etc/containers/systemd/users/ubuntu-toolbox.container +printf "\nVolume=/home/linuxbrew:/home/linuxbrew:rslave\nVolume=/etc/profile.d/brew.sh:/etc/profile.d/brew.sh:ro\nVolume=/usr/share/fish/vendor_conf.d/brew.fish:/usr/share/fish/vendor_conf.d/brew.fish:ro\n" >> /etc/containers/systemd/users/fedora-toolbox.container # Make systemd targets mkdir -p /usr/lib/systemd/user @@ -54,6 +54,6 @@ WantedBy=default.target EOF # Add ptyxis integration and have autostart tied to systemd targets -cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /usr/etc/containers/systemd/users/"$i".container -printf "\n\n[Install]\nWantedBy=%s.target" "$i" >> /usr/etc/containers/systemd/users/"$i".container +cat /usr/share/ublue-os/bluefin-cli/ptyxis-integration >> /etc/containers/systemd/users/"$i".container +printf "\n\n[Install]\nWantedBy=%s.target" "$i" >> /etc/containers/systemd/users/"$i".container done diff --git a/system_files/dx/usr/etc/profile.d/vscode-bluefin-profile.sh b/system_files/dx/etc/profile.d/vscode-bluefin-profile.sh similarity index 100% rename from system_files/dx/usr/etc/profile.d/vscode-bluefin-profile.sh rename to system_files/dx/etc/profile.d/vscode-bluefin-profile.sh diff --git a/system_files/dx/usr/etc/skel/.config/Code/User/settings.json b/system_files/dx/etc/skel/.config/Code/User/settings.json similarity index 100% rename from system_files/dx/usr/etc/skel/.config/Code/User/settings.json rename to system_files/dx/etc/skel/.config/Code/User/settings.json diff --git a/system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis b/system_files/kinoite/etc/dconf/db/local.d/01-ptyxis similarity index 100% rename from system_files/kinoite/usr/etc/dconf/db/local.d/01-ptyxis rename to system_files/kinoite/etc/dconf/db/local.d/01-ptyxis diff --git a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh b/system_files/kinoite/etc/profile.d/aurora-fastfetch.sh similarity index 100% rename from system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh rename to system_files/kinoite/etc/profile.d/aurora-fastfetch.sh diff --git a/system_files/kinoite/usr/etc/profile.d/ksshaskpass.sh b/system_files/kinoite/etc/profile.d/ksshaskpass.sh similarity index 100% rename from system_files/kinoite/usr/etc/profile.d/ksshaskpass.sh rename to system_files/kinoite/etc/profile.d/ksshaskpass.sh diff --git a/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css b/system_files/kinoite/etc/skel/.config/gtk-4.0/gtk.css similarity index 100% rename from system_files/kinoite/usr/etc/skel/.config/gtk-4.0/gtk.css rename to system_files/kinoite/etc/skel/.config/gtk-4.0/gtk.css diff --git a/system_files/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css b/system_files/kinoite/etc/skel/.config/gtk-4.0/kde_window_geometry.css similarity index 100% rename from system_files/kinoite/usr/etc/skel/.config/gtk-4.0/kde_window_geometry.css rename to system_files/kinoite/etc/skel/.config/gtk-4.0/kde_window_geometry.css diff --git a/system_files/kinoite/usr/etc/xdg/kcm-about-distrorc b/system_files/kinoite/etc/xdg/kcm-about-distrorc similarity index 100% rename from system_files/kinoite/usr/etc/xdg/kcm-about-distrorc rename to system_files/kinoite/etc/xdg/kcm-about-distrorc diff --git a/system_files/kinoite/usr/etc/xdg/kdeglobals b/system_files/kinoite/etc/xdg/kdeglobals similarity index 100% rename from system_files/kinoite/usr/etc/xdg/kdeglobals rename to system_files/kinoite/etc/xdg/kdeglobals diff --git a/system_files/kinoite/usr/etc/xdg/krunnerrc b/system_files/kinoite/etc/xdg/krunnerrc similarity index 100% rename from system_files/kinoite/usr/etc/xdg/krunnerrc rename to system_files/kinoite/etc/xdg/krunnerrc diff --git a/system_files/kinoite/usr/etc/xdg/kwinrc b/system_files/kinoite/etc/xdg/kwinrc similarity index 100% rename from system_files/kinoite/usr/etc/xdg/kwinrc rename to system_files/kinoite/etc/xdg/kwinrc diff --git a/system_files/shared/usr/etc/distrobox/distrobox.conf b/system_files/shared/etc/distrobox/distrobox.conf similarity index 100% rename from system_files/shared/usr/etc/distrobox/distrobox.conf rename to system_files/shared/etc/distrobox/distrobox.conf diff --git a/system_files/shared/usr/etc/distrobox/distrobox.example b/system_files/shared/etc/distrobox/distrobox.example similarity index 100% rename from system_files/shared/usr/etc/distrobox/distrobox.example rename to system_files/shared/etc/distrobox/distrobox.example diff --git a/system_files/shared/usr/etc/profile.d/askpass.sh b/system_files/shared/etc/profile.d/askpass.sh similarity index 100% rename from system_files/shared/usr/etc/profile.d/askpass.sh rename to system_files/shared/etc/profile.d/askpass.sh diff --git a/system_files/shared/usr/etc/profile.d/bluefin-firstboot.sh b/system_files/shared/etc/profile.d/bluefin-firstboot.sh similarity index 100% rename from system_files/shared/usr/etc/profile.d/bluefin-firstboot.sh rename to system_files/shared/etc/profile.d/bluefin-firstboot.sh diff --git a/system_files/shared/usr/etc/profile.d/brew-bash-completion.sh b/system_files/shared/etc/profile.d/brew-bash-completion.sh similarity index 100% rename from system_files/shared/usr/etc/profile.d/brew-bash-completion.sh rename to system_files/shared/etc/profile.d/brew-bash-completion.sh diff --git a/system_files/shared/usr/etc/profile.d/neofetch.sh b/system_files/shared/etc/profile.d/neofetch.sh similarity index 100% rename from system_files/shared/usr/etc/profile.d/neofetch.sh rename to system_files/shared/etc/profile.d/neofetch.sh diff --git a/system_files/shared/usr/etc/profile.d/open.sh b/system_files/shared/etc/profile.d/open.sh similarity index 100% rename from system_files/shared/usr/etc/profile.d/open.sh rename to system_files/shared/etc/profile.d/open.sh diff --git a/system_files/shared/usr/etc/security/limits.d/30-brew-limits.conf b/system_files/shared/etc/security/limits.d/30-brew-limits.conf similarity index 100% rename from system_files/shared/usr/etc/security/limits.d/30-brew-limits.conf rename to system_files/shared/etc/security/limits.d/30-brew-limits.conf diff --git a/system_files/shared/usr/etc/skel/.config/autostart/bluefin-firstboot.desktop b/system_files/shared/etc/skel/.config/autostart/bluefin-firstboot.desktop similarity index 100% rename from system_files/shared/usr/etc/skel/.config/autostart/bluefin-firstboot.desktop rename to system_files/shared/etc/skel/.config/autostart/bluefin-firstboot.desktop diff --git a/system_files/shared/usr/etc/skel/.config/toolbox/host-welcome-shown b/system_files/shared/etc/skel/.config/toolbox/host-welcome-shown similarity index 100% rename from system_files/shared/usr/etc/skel/.config/toolbox/host-welcome-shown rename to system_files/shared/etc/skel/.config/toolbox/host-welcome-shown diff --git a/system_files/shared/usr/etc/skel/.local/share/flatpak/overrides/com.google.Chrome b/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.google.Chrome similarity index 100% rename from system_files/shared/usr/etc/skel/.local/share/flatpak/overrides/com.google.Chrome rename to system_files/shared/etc/skel/.local/share/flatpak/overrides/com.google.Chrome diff --git a/system_files/shared/usr/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code b/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code similarity index 100% rename from system_files/shared/usr/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code rename to system_files/shared/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code diff --git a/system_files/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette b/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette similarity index 100% rename from system_files/shared/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette rename to system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette diff --git a/system_files/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile b/system_files/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile similarity index 100% rename from system_files/shared/usr/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile rename to system_files/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile diff --git a/system_files/shared/usr/etc/systemd/user.conf b/system_files/shared/etc/systemd/user.conf similarity index 100% rename from system_files/shared/usr/etc/systemd/user.conf rename to system_files/shared/etc/systemd/user.conf diff --git a/system_files/shared/usr/etc/ublue-update/ublue-update.toml b/system_files/shared/etc/ublue-update/ublue-update.toml similarity index 100% rename from system_files/shared/usr/etc/ublue-update/ublue-update.toml rename to system_files/shared/etc/ublue-update/ublue-update.toml diff --git a/system_files/shared/usr/etc/yafti.yml b/system_files/shared/etc/yafti.yml similarity index 100% rename from system_files/shared/usr/etc/yafti.yml rename to system_files/shared/etc/yafti.yml diff --git a/system_files/shared/usr/etc/zsh/zlogin b/system_files/shared/etc/zsh/zlogin similarity index 100% rename from system_files/shared/usr/etc/zsh/zlogin rename to system_files/shared/etc/zsh/zlogin diff --git a/system_files/shared/usr/etc/zsh/zlogout b/system_files/shared/etc/zsh/zlogout similarity index 100% rename from system_files/shared/usr/etc/zsh/zlogout rename to system_files/shared/etc/zsh/zlogout diff --git a/system_files/shared/usr/etc/zsh/zprofile b/system_files/shared/etc/zsh/zprofile similarity index 100% rename from system_files/shared/usr/etc/zsh/zprofile rename to system_files/shared/etc/zsh/zprofile diff --git a/system_files/shared/usr/etc/zsh/zshenv b/system_files/shared/etc/zsh/zshenv similarity index 100% rename from system_files/shared/usr/etc/zsh/zshenv rename to system_files/shared/etc/zsh/zshenv diff --git a/system_files/shared/usr/etc/zsh/zshrc b/system_files/shared/etc/zsh/zshrc similarity index 100% rename from system_files/shared/usr/etc/zsh/zshrc rename to system_files/shared/etc/zsh/zshrc diff --git a/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service b/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service index 0dd0aeaf24e..447e9fb9579 100644 --- a/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service +++ b/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service @@ -8,7 +8,7 @@ ConditionPathExists=!/etc/.%N.stamp [Service] Type=oneshot -ExecStart=/usr/bin/bash -c "for i in /usr/etc/*; do cp -r -n $i /etc; done" +ExecStart=/usr/bin/bash -c "for i in /etc/*; do cp -r -n $i /etc; done" ExecStart=/usr/bin/systemctl restart dconf-update.service ExecStart=/usr/bin/touch /etc/.%N.stamp diff --git a/system_files/shared/usr/libexec/ublue-user-setup b/system_files/shared/usr/libexec/ublue-user-setup index 43596a7d4a1..c15ea2e6817 100755 --- a/system_files/shared/usr/libexec/ublue-user-setup +++ b/system_files/shared/usr/libexec/ublue-user-setup @@ -35,7 +35,7 @@ fi # IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) # Ensure custom ptyxis theme is present -PTYXIS_THEME_DIR="/usr/etc/skel/.local/share/org.gnome.Ptyxis/palettes" +PTYXIS_THEME_DIR="/etc/skel/.local/share/org.gnome.Ptyxis/palettes" PTYXIS_DIR="$HOME/.local/share/org.gnome.Ptyxis/palettes" mkdir -p "$PTYXIS_DIR" if [[ ! -f "$PTYXIS_DIR/catppuccin-dynamic.palette" ]]; then diff --git a/system_files/silverblue/usr/etc/dconf/db/gdm.d/01-ublue b/system_files/silverblue/etc/dconf/db/gdm.d/01-ublue similarity index 100% rename from system_files/silverblue/usr/etc/dconf/db/gdm.d/01-ublue rename to system_files/silverblue/etc/dconf/db/gdm.d/01-ublue diff --git a/system_files/silverblue/usr/etc/dconf/db/local.d/01-ublue b/system_files/silverblue/etc/dconf/db/local.d/01-ublue similarity index 100% rename from system_files/silverblue/usr/etc/dconf/db/local.d/01-ublue rename to system_files/silverblue/etc/dconf/db/local.d/01-ublue diff --git a/system_files/silverblue/usr/etc/dconf/db/local.d/02-bluefin-folders b/system_files/silverblue/etc/dconf/db/local.d/02-bluefin-folders similarity index 100% rename from system_files/silverblue/usr/etc/dconf/db/local.d/02-bluefin-folders rename to system_files/silverblue/etc/dconf/db/local.d/02-bluefin-folders diff --git a/system_files/silverblue/usr/etc/dconf/db/local.d/locks/01-ublue-lock b/system_files/silverblue/etc/dconf/db/local.d/locks/01-ublue-lock similarity index 100% rename from system_files/silverblue/usr/etc/dconf/db/local.d/locks/01-ublue-lock rename to system_files/silverblue/etc/dconf/db/local.d/locks/01-ublue-lock diff --git a/system_files/silverblue/usr/etc/dconf/profile/gdm b/system_files/silverblue/etc/dconf/profile/gdm similarity index 100% rename from system_files/silverblue/usr/etc/dconf/profile/gdm rename to system_files/silverblue/etc/dconf/profile/gdm diff --git a/system_files/silverblue/usr/etc/dconf/profile/user b/system_files/silverblue/etc/dconf/profile/user similarity index 100% rename from system_files/silverblue/usr/etc/dconf/profile/user rename to system_files/silverblue/etc/dconf/profile/user diff --git a/system_files/silverblue/usr/etc/environment b/system_files/silverblue/etc/environment similarity index 100% rename from system_files/silverblue/usr/etc/environment rename to system_files/silverblue/etc/environment diff --git a/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh b/system_files/silverblue/etc/profile.d/bluefin-fastfetch.sh similarity index 100% rename from system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh rename to system_files/silverblue/etc/profile.d/bluefin-fastfetch.sh From 40dcea51390a2859f29ae396c2343c15ebb776a2 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Thu, 8 Aug 2024 08:08:53 -0400 Subject: [PATCH 2/3] fix: Delete ublue-etc-merge.service We don't need this --- .../lib/systemd/system/ublue-etc-merge.service | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service diff --git a/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service b/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service deleted file mode 100644 index 447e9fb9579..00000000000 --- a/system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Merge /etc files -After=local-fs.target -Before=ublue-guest-user.service -ConditionVirtualization=yes -ConditionPathExists=!/run/ostree-booted -ConditionPathExists=!/etc/.%N.stamp - -[Service] -Type=oneshot -ExecStart=/usr/bin/bash -c "for i in /etc/*; do cp -r -n $i /etc; done" -ExecStart=/usr/bin/systemctl restart dconf-update.service -ExecStart=/usr/bin/touch /etc/.%N.stamp - -[Install] -WantedBy=multi-user.target default.target From 72b519ebcc6bb2e6a5f6afd05dd53a5e0900e98c Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Thu, 8 Aug 2024 08:38:45 -0400 Subject: [PATCH 3/3] fix: remove etc-merge service --- build_files/systemd.sh | 1 - .../shared/usr/lib/systemd/system/ublue-guest-user.service | 1 - 2 files changed, 2 deletions(-) diff --git a/build_files/systemd.sh b/build_files/systemd.sh index cc91e93e047..eab8767d980 100755 --- a/build_files/systemd.sh +++ b/build_files/systemd.sh @@ -8,7 +8,6 @@ systemctl enable dconf-update.service systemctl --global enable ublue-flatpak-manager.service systemctl enable ublue-update.timer systemctl enable ublue-system-setup.service -systemctl enable ublue-etc-merge.service systemctl enable ublue-guest-user.service systemctl enable brew-setup.service systemctl enable brew-upgrade.timer diff --git a/system_files/shared/usr/lib/systemd/system/ublue-guest-user.service b/system_files/shared/usr/lib/systemd/system/ublue-guest-user.service index c773874d04f..ad5d1547822 100644 --- a/system_files/shared/usr/lib/systemd/system/ublue-guest-user.service +++ b/system_files/shared/usr/lib/systemd/system/ublue-guest-user.service @@ -1,7 +1,6 @@ [Unit] Description=Setup Guest User dotfiles After=local-fs.target -After=ublue-etc-merge.service ConditionHost=ContainerTestUblueOS ConditionVirtualization=yes ConditionPathExists=/var/home/ublue-os