Remove several obsolete migrations

Makefile.am

@@ -22,13 +22,11 @@ dist_systemdunit_DATA = \
 	eos-enable-zram.service \
 	eos-firewall-localonly.service \
 	eos-firstboot.service \
+	eos-fix-flatpak-overrides.service \
 	eos-live-boot-overlayfs-setup.service \
-	eos-ostree-bootloader-setup.service \
-	eos-prune-printers.service \
 	eos-transient-setup.service \
 	eos-update-flatpak-repos.service \
 	eos-update-system-ca.service \
-	hack-remove-global-override.service \
 	$(NULL)
 
 dist_systemduserunit_DATA = \
@@ -78,7 +76,6 @@ uninstall-hook:
 udevrulesdir = $(udevdir)/rules.d
 dist_udevrules_DATA = \
 	50-disk-bfq.rules \
-	50-meson-vdec.rules \
 	50-usb-mouse-wakeup.rules \
 	60-suspend-mode.rules \
 	$(NULL)
@@ -89,8 +86,6 @@ dist_sbin_SCRIPTS = \
 	eos-firewall-localonly \
 	eos-firstboot \
 	eos-live-boot-overlayfs-setup \
-	eos-ostree-bootloader-setup \
-	eos-prune-printers \
 	eos-repartition-mbr \
 	eos-test-mode \
 	eos-transient-setup \
@@ -104,10 +99,8 @@ dist_libexec_SCRIPTS = \
 
 tmpfilesdir = $(prefix)/lib/tmpfiles.d
 dist_tmpfiles_DATA = \
-	tmpfiles.d/avahi-service-writers.conf \
 	tmpfiles.d/chromium-system-services.conf \
 	tmpfiles.d/eos-boot-helper.conf \
-	tmpfiles.d/flatpak-overrides.conf \
 	$(NULL)
 
 com.endlessm.TestMode.policy: com.endlessm.TestMode.policy.in

eos-fix-flatpak-overrides.service

@@ -0,0 +1,22 @@
+[Unit]
+Description=Fix incorrect Flatpak override symlink
+DefaultDependencies=no
+Conflicts=shutdown.target
+Wants=local-fs.target
+After=local-fs.target
+
+# Only run on updates
+Before=multi-user.target systemd-update-done.service
+ConditionNeedsUpdate=|/etc
+ConditionNeedsUpdate=|/var
+
+# Run only if this path is a dangling symbolic link
+ConditionPathIsSymbolicLink=/var/lib/flatpak/overrides
+ConditionPathExists=!/var/lib/flatpak/overrides
+
+[Service]
+Type=oneshot
+ExecStart=rm -f /var/lib/flatpak/overrides
+
+[Install]
+WantedBy=multi-user.target

tmpfiles.d/eos-boot-helper.conf

@@ -1,7 +1,5 @@
-# remove stamp file from eos-migrate-image-defaults
-# (from 3.2.0 move to /var/lib/eos-image-default)
-r /var/lib/.eos-migrate-image-defaults
+# Remove stamp file from eos-prune-printers (added on upgrade to Endless OS 4)
+r /var/lib/eos4-prune-printers
 
-# remove stamp file from eos-fix-home-dir-permissions
-# (from 3.1.6 change to default home dir permissions)
-r /var/lib/misc/eos-dir-mode-700
+# Remove stamp file from eos-reclaim-swap (itself removed in Endless OS 4)
+r /var/eos-swap-reclaimed