From c063f322947dcf06856fa44561c0a8a758195a53 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Wed, 22 Feb 2023 20:15:52 +0100 Subject: [PATCH] droid-juicer: backport upstream patch improving UX --- src/droid-juicer/debian/changelog | 6 ++++ ...display-manager-from-starting-while-.patch | 35 +++++++++++++++++++ src/droid-juicer/debian/patches/series | 1 + 3 files changed, 42 insertions(+) create mode 100644 src/droid-juicer/debian/patches/0001-service-prevent-display-manager-from-starting-while-.patch create mode 100644 src/droid-juicer/debian/patches/series diff --git a/src/droid-juicer/debian/changelog b/src/droid-juicer/debian/changelog index 04109a9ac..ab031baf8 100644 --- a/src/droid-juicer/debian/changelog +++ b/src/droid-juicer/debian/changelog @@ -1,3 +1,9 @@ +rust-droid-juicer (0.2.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * droid-juicer: backport upstream patch improving UX + + -- Arnaud Ferraris Wed, 22 Feb 2023 20:17:03 +0100 + rust-droid-juicer (0.2.0-1) unstable; urgency=medium * Package droid-juicer 0.2.0 from crates.io using debcargo 2.6.0 diff --git a/src/droid-juicer/debian/patches/0001-service-prevent-display-manager-from-starting-while-.patch b/src/droid-juicer/debian/patches/0001-service-prevent-display-manager-from-starting-while-.patch new file mode 100644 index 000000000..32670dc0a --- /dev/null +++ b/src/droid-juicer/debian/patches/0001-service-prevent-display-manager-from-starting-while-.patch @@ -0,0 +1,35 @@ +From 1adeed7f3f3f3e5e6732ba6f6d6d6df226f1f345 Mon Sep 17 00:00:00 2001 +From: Arnaud Ferraris +Date: Sat, 11 Feb 2023 23:52:28 +0100 +Subject: [PATCH] service: prevent display manager from starting while running + +We can end up in situations where droid-juicer is running and the +display manager starts anyway, so the user can login and start working. +However the device will reboot as soon as droid-juicer finishes, +probably disappointing the user. Let's ensure this doesn't happen by +ensuring the display manager won't start while droid-juicer runs. + +Origin: Upstream, commit def1459f61452730f0ee481196ca279100d5d03b +--- + droid-juicer.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/droid-juicer.service b/droid-juicer.service +index 2820891..714f166 100644 +--- a/droid-juicer.service ++++ b/droid-juicer.service +@@ -2,10 +2,12 @@ + Description=Android vendor firmware extraction + Wants=sysinit.target make-dynpart-mappings@super.service + After=-.mount tmp.mount boot.mount make-dynpart-mappings@super.service ++Before=plymouth-quit.service display-manager.service + ConditionPathExists=!/var/lib/droid-juicer/status.json + + [Service] + Type=oneshot ++ExecStartPre=-/usr/bin/plymouth display-message --text="Extracting binary firmware..." + ExecStart=/usr/bin/droid-juicer + ExecStartPost=/usr/sbin/reboot + +-- +2.39.1 diff --git a/src/droid-juicer/debian/patches/series b/src/droid-juicer/debian/patches/series new file mode 100644 index 000000000..1c2c866d0 --- /dev/null +++ b/src/droid-juicer/debian/patches/series @@ -0,0 +1 @@ +0001-service-prevent-display-manager-from-starting-while-.patch -- 2.39.5