From ba1fd6bf14701ed9f3791e390e19a988399cb35e Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Thu, 14 May 2026 13:03:32 +0200 Subject: [PATCH] main/postmarketos-usb-moded: add OpenRC MTP mode OpenRC also needs MTP mode for usb-signaller. Part-of: --- main/postmarketos-usb-moded/APKBUILD | 6 ++++-- .../rootfs-etc-init.d-usb-moded-mtp-mode.initd | 9 +++++++++ .../rootfs-usr-bin-usb-moded-mtp-mode | 9 ++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 main/postmarketos-usb-moded/rootfs-etc-init.d-usb-moded-mtp-mode.initd diff --git a/main/postmarketos-usb-moded/APKBUILD b/main/postmarketos-usb-moded/APKBUILD index 43a1ec94d..c95a15c84 100644 --- a/main/postmarketos-usb-moded/APKBUILD +++ b/main/postmarketos-usb-moded/APKBUILD @@ -1,6 +1,6 @@ maintainer="Clayton Craft " pkgname=postmarketos-usb-moded -pkgver=6 +pkgver=7 pkgrel=0 pkgdesc="Meta package for configuring usb-moded on postmarketOS" url="https://postmarketos.org" @@ -36,6 +36,7 @@ _source644=" _source755=" etc/init.d/usb-moded-developer-mode.initd etc/init.d/usb-moded-tethering-mode.initd + etc/init.d/usb-moded-mtp-mode.initd usr/bin/usb-moded-developer-mode usr/bin/usb-moded-tethering-mode usr/bin/usb-moded-mtp-mode @@ -124,8 +125,9 @@ af41dc4ceb7255dbb88273916306c6e7e66c879bb67523c9571f9e812c9b36ab00ea666ade49369c fe4d085730d448e51bbce9e99c3cc7b4662e5fadd6108e5f2e74040f0d4e901132aa7f3367acad183198c5a150862bdef536a6a1968784bf9babc1702c2f16fe rootfs-usr-lib-systemd-system-usb-moded.service.d-override.conf 95681a9bb2d5f8d99f51762d09dc4f0c487442a20070ad1439de1309b775ac1752fe60a205389cc74a1ee9026afc4ad984ac3363659a6749792835654a111d7f rootfs-etc-init.d-usb-moded-developer-mode.initd 1d8b98508f7969a4ba671866eee5e54261c50362e41b18bfebf004a6ed1e97d01a8eb83e3a33c392cbd00ea1a20f0f004b4794582ef1b71dedbba0fba2dc4602 rootfs-etc-init.d-usb-moded-tethering-mode.initd +b8a4d9c8d1e2cde8d6b31bbb3e61d37c05cf2aa1e04cb25c24308839d045205e0604b103d2d60f9834782dcc64ab346cfe8f97797d4d0c86f54e4cfceb6af679 rootfs-etc-init.d-usb-moded-mtp-mode.initd 9aab1a91a817e2337320ee0fa1bf6133e65e9269631560c1860c3b777adb336d036cebbc2510d1df35a82bf4396d553ff9e2edd0004027c7a3130168f7f50d90 rootfs-usr-bin-usb-moded-developer-mode 4539e5ba2d72b585b24b8a8606019f680226026d8316cdd69d476e3aa8126e5f2d236c5faaa2541f4b24e10bbb69ca5233e0b8e025a8307d4688e0c8fa071800 rootfs-usr-bin-usb-moded-tethering-mode -87b0cbf8388ea77ef674d1dee2744cb8cc41db9a703ac449883466f145025604b210c8f798dbaff8e4bccbff1eb2b9527b7f355910eb1fee055978b3444feb6e rootfs-usr-bin-usb-moded-mtp-mode +0174ce39326b09d982cfcc7a91893e23e1fb0505a65c0bc3d049c144739435589faf973b3102f7da2e32b6bc6ddfc308f52bfddefd398a0e13156f4875a6a5ff rootfs-usr-bin-usb-moded-mtp-mode ca4b82b0cccbbb498b8898c4e360142136c46687e97bce85553dc1793bf8ae2e0f509c2a1acdf96b08dc7c6b69f098b56181f9033ad669cabbf5a159ad8efbaa rootfs-usr-lib-systemd-system-generators-umtprd-config-generator " diff --git a/main/postmarketos-usb-moded/rootfs-etc-init.d-usb-moded-mtp-mode.initd b/main/postmarketos-usb-moded/rootfs-etc-init.d-usb-moded-mtp-mode.initd new file mode 100644 index 000000000..24b35c24f --- /dev/null +++ b/main/postmarketos-usb-moded/rootfs-etc-init.d-usb-moded-mtp-mode.initd @@ -0,0 +1,9 @@ +#!/sbin/openrc-run + +description="USB Moded MTP Mode" +command="usb-moded-mtp-mode" +command_args="up" + +stop() { + usb-moded-mtp-mode down +} diff --git a/main/postmarketos-usb-moded/rootfs-usr-bin-usb-moded-mtp-mode b/main/postmarketos-usb-moded/rootfs-usr-bin-usb-moded-mtp-mode index efef98357..3a5e63ba5 100644 --- a/main/postmarketos-usb-moded/rootfs-usr-bin-usb-moded-mtp-mode +++ b/main/postmarketos-usb-moded/rootfs-usr-bin-usb-moded-mtp-mode @@ -8,7 +8,14 @@ TIMEOUT=10s up() { echo "Starting MTP responder" - systemctl start umtprd + if [ -d "/run/systemd" ]; then + systemctl start umtprd + elif [ -f "/etc/rc.conf" ]; then + rc-service umtprd start + else + echo "Unsupported init system" + exit 1 + fi # Wait up to 10s for EP fds to appear # usb-signaller and usb-moded need