feat: switch to yafti for first boot

based on what's done in bluefin
& https://github.com/ublue-os/yafti#running-from-a-containerfile
This commit is contained in:
ER
2023-04-02 12:00:58 +03:00
parent d572830b96
commit 0b669f5bb5
4 changed files with 10 additions and 8 deletions

View File

@@ -7,7 +7,6 @@ FROM ghcr.io/ublue-os/silverblue-main:${FEDORA_MAJOR_VERSION}
COPY etc /etc
# COPY usr /usr
COPY ublue-firstboot /usr/bin
COPY recipe.yml /etc/ublue-recipe.yml
# yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml

View File

@@ -7,4 +7,7 @@ for pkg in $rpm_packages; do \
echo "Installing: ${pkg}" && \
rpm-ostree install $pkg; \
done
echo "---"
echo "---"
# install yafti to install flatpaks on first boot, https://github.com/ublue-os/yafti
pip install --prefix=/usr yafti

View File

@@ -1,6 +1,6 @@
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
if test ! -e "$HOME"/.config/ublue/firstboot-done; then
if test ! -e "$HOME"/.config/autostart/ublue-firstboot.desktop; then
mkdir -p "$HOME"/.config/autostart
cp -f /etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
fi
fi
fi

View File

@@ -1,8 +1,8 @@
[Desktop Entry]
Name=Ublue Desktop FirstBoot Setup
Comment=Sets up Ublue Desktop Correctly On FirstBoot
Exec=/usr/bin/ublue-firstboot
Name=uBlue First Boot Setup
Comment=Sets up uBlue Desktop Correctly On FirstBoot
Exec=/usr/bin/yafti /etc/yafti.yml
Icon=org.gnome.Terminal
Type=Application
Categories=Utility;System;
Name[en_US]=startup
Name[en_US]=startup