Disable auto update on reenable/install (#641)

- Disable `update-engine.service` on install/reenable
- Decouple `sync.service` and `xochitl.service` as this means that either sync doesn't work, or xochitl starts when it is disabled.
  - Accomplished by adding a `manual-sync.service` and masking `sync.service`
  - `/opt/bin/xochitl` will also run `sync --service` in the background manually if running from a chroot and there is no sync service running
- Add `kill-xochitl` command as oxide stop events do not allow arguments

Author: Eeems

package/kernelctl/force_reinstall_on_toltecctl_reenable

@@ -5,25 +5,24 @@
 pkgnames=(kernelctl)
 pkgdesc="Manage aftermarket kernels"
 url=https://toltec-dev.org/
-pkgver=0.1-3
+pkgver=0.1-4
 timestamp=2022-03-14T00:00Z
 section="utils"
 maintainer="Salvatore Stella <etn45p4m@gmail.com>"
 license=MIT
 
 source=(
     kernelctl
-    force_reinstall_on_toltecctl_reenable
 )
 sha256sums=(
     SKIP
-    SKIP
 )
 
 package() {
+    touch "$srcdir"/emptyfile
     install -D -m 744 -t "$pkgdir"/opt/bin "$srcdir"/kernelctl
     install -d "$pkgdir"/opt/usr/share/kernelctl
-    install -D -m 666 -t "$pkgdir"/usr/share/kernelctl/ "$srcdir"/force_reinstall_on_toltecctl_reenable
+    install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/kernelctl "$srcdir"/emptyfile
 }
 
 configure() {

package/kernelctl/package

@@ -3,16 +3,22 @@
 # SPDX-License-Identifier: MIT
 
 pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry)
-pkgver=2.4-1
+pkgver=2.4-2
 _sentryver=0.4.17
 timestamp=2022-05-22T03:18:32Z
 maintainer="Eeems <eeems@eeems.email>"
 url=https://oxide.eeems.codes
 license=MIT
 flags=(patch_rm2fb)
 image=qt:v2.3
-source=("https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz")
-sha256sums=(a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee)
+source=(
+    "https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz"
+    toltec-override.conf
+)
+sha256sums=(
+    a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee
+    SKIP
+)
 
 build() {
     find . -name "*.pro" -type f -print0 \
@@ -84,6 +90,8 @@ tarnish() {
         install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf
         install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish
+        install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
+            "$srcdir"/toltec-override.conf
     }
     configure() {
         systemctl daemon-reload

package/oxide/package

@@ -0,0 +1,6 @@
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+[Unit]
+Conflicts=xochitl.service
+Conflicts=sync.service

package/oxide/toltec-override.conf

@@ -6,8 +6,8 @@ archs=(rm1 rm2)
 pkgnames=(toltec-base)
 pkgdesc="Metapackage defining the base set of packages in a Toltec install"
 url=https://toltec-dev.org/
-pkgver=1.0-1
-timestamp=2022-02-28T00:12Z
+pkgver=1.1-1
+timestamp=2022-11-07T20:19:57Z
 section="utils"
 maintainer="Eeems <eeems@eeems.email>"
 license=MIT
@@ -19,5 +19,15 @@ source=()
 sha256sums=()
 
 package() {
-    true
+    touch "$srcdir"/emptyfile
+    install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/toltec-base "$srcdir"/emptyfile
+}
+
+configure() {
+    if is-enabled "update-engine.service"; then
+        echo "Disabling automatic update"
+        systemctl disable --now update-engine
+    fi
+    echo "Disabling usb1 network device to avoid long boots"
+    systemctl mask sys-subsystem-net-devices-usb1.device
 }

package/toltec-base/package

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+killall xochitl

package/xochitl/kill-xochitl

@@ -0,0 +1,21 @@
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+[Unit]
+Description=reMarkable Document Sync without the xochitl.service dependency
+After=dbus.socket
+StartLimitIntervalSec=60
+StartLimitBurst=4
+Conflicts=sync.service
+
+[Service]
+# Do NOT make this dbus, systemd will kill the service when it should be
+# running otherwise.
+Type=simple
+BusName=no.remarkable.sync
+ExecStart=/usr/bin/sync --service
+Restart=on-failure
+RestartForceExitStatus=SIGHUP SIGINT SIGTERM SIGPIPE
+
+[Install]
+WantedBy=multi-user.target

package/xochitl/manual-sync.service

@@ -5,8 +5,8 @@
 pkgnames=(xochitl)
 pkgdesc="Read documents and take notes"
 url=https://remarkable.com
-pkgver=0.0.0-13
-timestamp=2022-03-05T23:26Z
+pkgver=0.0.0-14
+timestamp=2022-11-07T20:19:57Z
 section="readers"
 maintainer="Mattéo Delabre <spam@delab.re>"
 license=MIT
@@ -24,6 +24,7 @@ source=(
     toltec-after-launcher.conf
     toltec-wrapper.conf
     env-readme
+    manual-sync.service
 )
 sha256sums=(
     SKIP
@@ -33,6 +34,7 @@ sha256sums=(
     SKIP
     SKIP
     SKIP
+    SKIP
 )
 
 package() {
@@ -56,11 +58,22 @@ package() {
         "$srcdir"/toltec-after-launcher.conf
     install -D -m 644 -t "$pkgdir"/etc/systemd/system/remarkable-reboot.service.d \
         "$srcdir"/toltec-after-launcher.conf
+    install -D -m 644 -t "$pkgdir"/etc/systemd/system \
+        "$srcdir"/manual-sync.service
 }
 
 configure() {
     systemctl daemon-reload
 
+    # sync.service interferes with launchers
+    # we use manual-sync.service instead
+    if [[ "x$(systemctl is-enabled sync.service)" != "xmasked" ]]; then
+        systemctl mask sync.service
+    fi
+    if ! is-active manual-sync.service; then
+        systemctl enable --now manual-sync.service
+    fi
+
     if is-enabled xochitl.service && ! is-enabled launcher.service; then
         # This package changes xochitl.service to alias it to launcher.service
         # when enabled. If xochitl was previously enabled, force the creation
@@ -69,9 +82,19 @@ configure() {
     fi
 }
 
+preremove() {
+    if is-active manual-sync.service; then
+        systemctl disable --now manual-sync.service
+    fi
+}
+
 postremove() {
     systemctl daemon-reload
 
+    if [[ "x$(systemctl is-enabled sync.service)" == "xmasked" ]]; then
+        systemctl unmask sync.service 2> /dev/null
+    fi
+
     if is-enabled xochitl.service && is-enabled launcher.service; then
         # If xochitl is currently the active launcher, make sure the
         # launcher.service alias is removed

package/xochitl/package

@@ -9,4 +9,13 @@ for file in /opt/etc/xochitl.env.d/*.env; do
         source "$file"
     fi
 done
+# If for some reason, sync.service is no longer masked, re-mask it
+# The package install should have handled this, but something may
+# have changed it.
+if [[ "x$(systemctl is-enabled sync.service)" != "xmasked" ]]; then
+    systemctl mask sync.service
+fi
+if ! systemctl is-active --quiet manual-sync.service; then
+    systemctl enable --now manual-sync.service
+fi
 exec /usr/bin/xochitl "$@"

package/xochitl/xochitl

@@ -11,19 +11,24 @@
         "/home/root",
         "/opt/etc",
         "/run/dbus",
+        "/run/lock",
+        "/run/systemd",
         "/run/systemd/resolve",
         "/run/udev",
         "/tmp/runtime-root",
         "/usr/share",
         "/usr/share/remarkable/templates",
+        "/usr/local/share/ca-certificates",
         "/var/cache/fontconfig",
         "/var/lib/dbus",
+        "/var/volatile/tmp"
     ],
     "environment": {
+        "HOME": "/home/root",
         "QMLSCENE_DEVICE": "epaper",
-        "QT_QPA_PLATFORM": "epaper",
         "QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS": "rotate=180",
-        "HOME": "/home/root",
+        "QT_QPA_PLATFORM": "epaper",
+        "SYSTEMD_IGNORE_CHROOT": "true",
         "XDG_RUNTIME_DIR": "/tmp/runtime-root"
     }
 }