fix: Move files in /usr/etc to /etc (#1580)

Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>

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

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

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
 

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}"/ /

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

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

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

system_files/shared/usr/lib/systemd/system/ublue-etc-merge.service

@@ -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 /usr/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

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

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