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:
@@ -7,7 +7,6 @@ FROM ghcr.io/ublue-os/silverblue-main:${FEDORA_MAJOR_VERSION}
|
|||||||
COPY etc /etc
|
COPY etc /etc
|
||||||
# COPY usr /usr
|
# COPY usr /usr
|
||||||
|
|
||||||
COPY ublue-firstboot /usr/bin
|
|
||||||
COPY recipe.yml /etc/ublue-recipe.yml
|
COPY recipe.yml /etc/ublue-recipe.yml
|
||||||
|
|
||||||
# yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml
|
# yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml
|
||||||
|
|||||||
3
build.sh
3
build.sh
@@ -8,3 +8,6 @@ for pkg in $rpm_packages; do \
|
|||||||
rpm-ostree install $pkg; \
|
rpm-ostree install $pkg; \
|
||||||
done
|
done
|
||||||
echo "---"
|
echo "---"
|
||||||
|
|
||||||
|
# install yafti to install flatpaks on first boot, https://github.com/ublue-os/yafti
|
||||||
|
pip install --prefix=/usr yafti
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
|
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
|
mkdir -p "$HOME"/.config/autostart
|
||||||
cp -f /etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
|
cp -f /etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Ublue Desktop FirstBoot Setup
|
Name=uBlue First Boot Setup
|
||||||
Comment=Sets up Ublue Desktop Correctly On FirstBoot
|
Comment=Sets up uBlue Desktop Correctly On FirstBoot
|
||||||
Exec=/usr/bin/ublue-firstboot
|
Exec=/usr/bin/yafti /etc/yafti.yml
|
||||||
Icon=org.gnome.Terminal
|
Icon=org.gnome.Terminal
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Utility;System;
|
Categories=Utility;System;
|
||||||
|
|||||||
Reference in New Issue
Block a user