Skip to content

Commit

Permalink
config: move Rhythmbox from mandatory to default
Browse files Browse the repository at this point in the history
The 'mandatory' lists of apps are (a superset of) those which are
installed on existing systems when they upgrade to newer OS versions via
eos-updater-flatpak-autoinstall.d files in the OS.

Previously, Rhythmbox was part of the OSTree. In eos4.0 it was removed
from the OS, so an autoinstall file was added to make systems upgrading
to eos4.0 install the Flatpak to avoid the user losing a
previously-installed app.
endlessm/eos-application-tools@0e6c484

To avoid accidentally leaving OS components out of an image,
hooks/image/60-flatpak-autoinstall-counters.chroot asserts that any apps
listed as to be installed by autoinstall files are shipped as part of
the image. Such apps are listed in the 'apps_add_mandatory' key
separately from the 'apps_add_default' list so that personalities can
easily remove the default set without removing the mandatory set.

There is a checkpoint between eos4.0 and eos5, so it is guaranteed that
computers upgrading to eos5 will have first upgraded to eos4 (and hence
had Rhythmbox automatically installed if needed). So the autoinstall
file has been removed endlessm/eos-application-tools@86436b4
and thus there is no need for Rhythmbox to be listed as mandatory any
more. We will continue to install it by default, except on base where we
will save a little bit of space.

https://phabricator.endlessm.com/T34075
  • Loading branch information
starnight authored and wjt committed Nov 10, 2022
1 parent 77a705f commit d7da106
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config/defaults.ini
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ apps_add_mandatory =
org.gnome.Contacts
org.gnome.FileRoller
org.gnome.Logs
org.gnome.Rhythmbox3
org.gnome.Totem
org.gnome.Shotwell
org.gnome.font-viewer
Expand All @@ -505,6 +504,7 @@ apps_add =
org.blender.Blender
org.gimp.GIMP
org.gnome.Gnote
org.gnome.Rhythmbox3
org.gnome.Weather
org.inkscape.Inkscape
org.kde.gcompris
Expand Down

0 comments on commit d7da106

Please sign in to comment.