diff --git a/50-meson-vdec.rules b/50-meson-vdec.rules deleted file mode 100644 index ce1f224b..00000000 --- a/50-meson-vdec.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="video4linux", ATTR{name}=="meson-vdec", SYMLINK+="mfc-dec meson-vdec video-dec" diff --git a/Makefile.am b/Makefile.am index f668bd99..8382b163 100644 --- a/Makefile.am +++ b/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 diff --git a/debian/eos-boot-helper.postinst b/debian/eos-boot-helper.postinst deleted file mode 100644 index f73339b2..00000000 --- a/debian/eos-boot-helper.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#DEBHELPER# - -# Cleanup old wants symlinks for services we don't ship anymore -rm -f /etc/systemd/system/local-fs.target.wants/sysroot-boot.mount -rm -f /etc/systemd/system/local-fs.target.wants/boot.mount -rm -rf /etc/systemd/system/"dev-disk-by\x2dlabel-eos\x2dswap.device.wants" diff --git a/eos-fix-flatpak-overrides.service b/eos-fix-flatpak-overrides.service new file mode 100644 index 00000000..f1ebc723 --- /dev/null +++ b/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 diff --git a/eos-ostree-bootloader-setup b/eos-ostree-bootloader-setup deleted file mode 100755 index 43768322..00000000 --- a/eos-ostree-bootloader-setup +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# eos-ostree-bootloader-setup: Set OSTree sysroot bootloader configuration -# -# Copyright © 2022 Endless OS Foundation LLC -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -set -e - -# If the option is already set, leave it alone. -if ostree config get sysroot.bootloader >/dev/null 2>&1; then - exit 0 -fi - -# If uEnv.txt exists, assume uboot. Otherwise use none and assume the -# bootloader (likely grub) is fully bootloader spec capable. -if [ -f /boot/uEnv.txt ]; then - bootloader=uboot -else - bootloader=none -fi - -echo "Setting sysroot.bootloader to $bootloader" -ostree config set sysroot.bootloader "$bootloader" diff --git a/eos-ostree-bootloader-setup.service b/eos-ostree-bootloader-setup.service deleted file mode 100644 index a9fbab58..00000000 --- a/eos-ostree-bootloader-setup.service +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=Set OSTree sysroot bootloader configuration -DefaultDependencies=no -Conflicts=shutdown.target -Wants=local-fs.target -After=local-fs.target -RequiresMountsFor=/sysroot /boot - -# Only run on updates -Before=multi-user.target systemd-update-done.service -ConditionNeedsUpdate=|/etc -ConditionNeedsUpdate=|/var - -# Try to run before any ostree applications so that they all see the -# updated repo configuration. -Before=eos-autoupdater.service eos-updater.service -Before=eos-updater-avahi.service eos-update-server.service - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/sbin/eos-ostree-bootloader-setup - -[Install] -WantedBy=multi-user.target diff --git a/eos-prune-printers b/eos-prune-printers deleted file mode 100755 index dd87ba3a..00000000 --- a/eos-prune-printers +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env sh - -# eos-prune-printers: Purge all installed printers and corresponding drivers -# -# Copyright (C) 2021 Endless OS Foundation LLC -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . - -# Exit if the stamp file exists. The service file checks for this, but also -# guard against an accidental execution. -stamp_file=/var/lib/eos4-prune-printers -[ -e $stamp_file ] && exit 0 - -# Purge and cancel all print jobs -cancel -xa - -# Delete all printers with CUPS tool -for printer in $(lpstat -p | awk '/^printer/{print $2}') -do - echo Deleting "$printer" - lpadmin -x "$printer" -done - -# Remove the printer drivers and residual print cache files -systemctl stop cups - -# remove stamp file from eos-config-printer (from 4.0 use driverless printers) -LIB_CONFIG_PRINTER=/var/lib/eos-config-printer -if [ -d $LIB_CONFIG_PRINTER ]; then - echo Removing $LIB_CONFIG_PRINTER - rm -rf $LIB_CONFIG_PRINTER -else - echo $LIB_CONFIG_PRINTER does not exist -fi - -# clean up the residual print cache files -CACHE_CUPS=/var/cache/cups -if [ -d $CACHE_CUPS ]; then - echo Removing "$CACHE_CUPS/*" - rm -rf ${CACHE_CUPS:?}/* -else - echo $CACHE_CUPS does not exist -fi - -systemctl start cups - -touch $stamp_file diff --git a/eos-prune-printers.service b/eos-prune-printers.service deleted file mode 100644 index b87808a0..00000000 --- a/eos-prune-printers.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Endless prune printers -After=cups.service -Wants=cups.service -ConditionPathExists=!/var/lib/eos4-prune-printers -ConditionKernelCommandLine=!endless.live_boot - -[Service] -Type=oneshot -ExecStart=/usr/sbin/eos-prune-printers -StandardOutput=journal - -[Install] -WantedBy=multi-user.target diff --git a/hack-remove-global-override.service b/hack-remove-global-override.service deleted file mode 100644 index 748b3d13..00000000 --- a/hack-remove-global-override.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Remove hack flatpak global override -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 eos-updater-flatpak-installer.service -ConditionNeedsUpdate=|/etc -ConditionNeedsUpdate=|/var - -ConditionPathExists=/var/lib/flatpak/overrides/global -ConditionPathExists=/var/lib/flatpak/app/com.endlessm.HackComponents - -[Service] -Type=oneshot -ExecStart=/usr/bin/rm /var/lib/flatpak/overrides/global - -[Install] -WantedBy=multi-user.target diff --git a/tmpfiles.d/avahi-service-writers.conf b/tmpfiles.d/avahi-service-writers.conf deleted file mode 100644 index 1aa4bc9f..00000000 --- a/tmpfiles.d/avahi-service-writers.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Type Path Mode UID GID Age Argument -d /etc/avahi/services 0775 root avahi-service-writers diff --git a/tmpfiles.d/eos-boot-helper.conf b/tmpfiles.d/eos-boot-helper.conf index 2394941a..16ff76b6 100644 --- a/tmpfiles.d/eos-boot-helper.conf +++ b/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 diff --git a/tmpfiles.d/flatpak-overrides.conf b/tmpfiles.d/flatpak-overrides.conf deleted file mode 100644 index 3c3d88b3..00000000 --- a/tmpfiles.d/flatpak-overrides.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/flatpak/overrides 0755 - - - -L /var/lib/flatpak/overrides - - - - /run/flatpak/overrides