From aa0058de07ced3d55924ccef360192f36bca43b0 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 3 Sep 2019 14:50:43 +0200
Subject: [PATCH] modem/qcom_rmtfs: use new command line flags (!592)

The changes in command line parameters of rmtfs mean: use the modem*
partitions directly (-P), in read-only mode (-r)...and it will boot the
modem automagically when ready (-s)

I've removed the udev rules in the rmtfs package because it doesn't look
like they are needed with those command line flags.
---
 modem/qcom_rmtfs/APKBUILD         | 6 +++---
 modem/qcom_rmtfs/qcom_rmtfs.initd | 2 +-
 modem/qcom_rmtfs/udev.rules       | 9 ---------
 3 files changed, 4 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 modem/qcom_rmtfs/qcom_rmtfs.initd

diff --git a/modem/qcom_rmtfs/APKBUILD b/modem/qcom_rmtfs/APKBUILD
index 81e8598db..0b6514733 100644
--- a/modem/qcom_rmtfs/APKBUILD
+++ b/modem/qcom_rmtfs/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=qcom_rmtfs
 pkgver=0.2_git20190729
 _commit="df6c19d0330d251af0a7c812bf5ddb847962ce2c"
-pkgrel=3
+pkgrel=4
 pkgdesc="Qualcomm Remote Filesystem Service Implementation"
 url="https://github.com/andersson/rmtfs"
 arch="all"
@@ -29,5 +29,5 @@ package() {
 }
 
 sha512sums="16cdc2f1173246d1ef83f12aa1f14f5f2aba9e3cbf2c632353bd42b3d64888b1fe6a87df4d6c2d3648028195bfb359ede600162854d42905ca88b79ce5eae940  rmtfs-df6c19d0330d251af0a7c812bf5ddb847962ce2c.tar.gz
-be32903df67af0ae2f6ea8c96f7c2bb003407258047622427097e3e867a6115a69e3ad2ad073a4182977f8d4d99c0283e9272f128ef7836a1d4365a24f7fd7ae  qcom_rmtfs.initd
-b27621462f9e176a6805a1cb5909e88bdc5bbde6fb879634cfd0e2d08ed4964b26e55586863e415c5f7aea5b03ce3430f38c90e57b46b1925b1d324eebd5eca2  udev.rules"
+4db920dc26dde899d86627cec6c4a21db61884c764c7ee83ba5bc1a2102d918c6d318113e21a8621bad47c7c6948362987d2980a916ccf9829d10e340d1f40b9  qcom_rmtfs.initd
+cb2435c159d81d3a40d30e1355c82a3d560dc2df7d05fee95085bc80e492ac93a728258f2f1b463c04a964979760990c8c9176b22cb585cbec19ab285cd45440  udev.rules"
diff --git a/modem/qcom_rmtfs/qcom_rmtfs.initd b/modem/qcom_rmtfs/qcom_rmtfs.initd
old mode 100644
new mode 100755
index ab6e52ac3..0db5e4a8b
--- a/modem/qcom_rmtfs/qcom_rmtfs.initd
+++ b/modem/qcom_rmtfs/qcom_rmtfs.initd
@@ -8,7 +8,7 @@ depend() {
 export LD_PRELOAD=/usr/lib/preload/libqipcrtr4msmipc.so
 
 command="/bin/sh"
-command_args="-c 'exec /usr/sbin/qcom_rmtfs -o /dev/disk/qcom_rmtfs -v 2>&1 | logger -t qcom_rmtfs'"
+command_args="-c 'exec /usr/sbin/qcom_rmtfs -P -r -s -v 2>&1 | logger -t qcom_rmtfs'"
 command_background="yes"
 
 pidfile="/var/run/${SVCNAME}.pid"
diff --git a/modem/qcom_rmtfs/udev.rules b/modem/qcom_rmtfs/udev.rules
index f80a99232..72886cb57 100644
--- a/modem/qcom_rmtfs/udev.rules
+++ b/modem/qcom_rmtfs/udev.rules
@@ -1,10 +1 @@
-KERNEL!="mmcblk?p[0-9]*", GOTO="qcom_rmtfs_end"
-
-ENV{ID_PART_ENTRY_NAME}=="modemst1",    SYMLINK+="disk/qcom_rmtfs/modem_fs1"
-ENV{ID_PART_ENTRY_NAME}=="modemst2",    SYMLINK+="disk/qcom_rmtfs/modem_fs2"
-ENV{ID_PART_ENTRY_NAME}=="fsc",         SYMLINK+="disk/qcom_rmtfs/modem_fsc"
-ENV{ID_PART_ENTRY_NAME}=="fsg",         SYMLINK+="disk/qcom_rmtfs/modem_fsg"
-
-LABEL="qcom_rmtfs_end"
-
 SUBSYSTEM=="uio", ATTR{name}=="rmtfs", SYMLINK+="qcom_rmtfs_uio1"