changed sxmo-pinephone openrc script to be device-agnostic and invoke a sxmo-setpermissions.sh instead #169

Makefile

@@ -38,7 +38,7 @@ install: $(PROGRAMS)
 	cd configs && find . -type f -exec install -D -m 0644 "{}" "$(DESTDIR)$(PREFIX)/share/sxmo/{}" \; && cd ..
 
 	# Configs
-	install -D -m 0755 -t $(DESTDIR)/etc/init.d configs/openrc/sxmo-pinephone
+	install -D -m 0755 -t $(DESTDIR)/etc/init.d configs/openrc/sxmo-setpermissions
 
 	install -D -m 0644 -t $(DESTDIR)/etc/alsa/conf.d/ configs/alsa/alsa_sxmo_enable_dmix.conf
 

configs/openrc/sxmo-pinephone

@@ -1,6 +0,0 @@
-#!/sbin/openrc-run
-
-description="Enable user access to pinephone hardware kernel interface"
-
-command="chmod"
-command_args="a+rw /sys/module/8723cs/parameters/rtw_scan_interval_thr /sys/power/state /sys/devices/platform/soc/1f00000.rtc/power/wakeup /sys/power/mem_sleep /sys/bus/usb/drivers/usb/unbind /sys/bus/usb/drivers/usb/bind /dev/rtc0 /sys/devices/platform/soc/1f03400.rsb/sunxi-rsb-3a3/axp221-pek/power/wakeup /sys/class/wakeup/*"

configs/openrc/sxmo-setpermissions

@@ -0,0 +1,5 @@
+#!/sbin/openrc-run
+
+description="Set user permissions to aspects of the hardware kernel interface"
+
+command="/usr/bin/sxmo_setpermissions.sh"

scripts/core/sxmo_setpermissions.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This script is executed as root
+# from the init process and sets
+# some device-specific permissions
+
+DEVICE="unknown"
+
+#Detecting device
+if [ -e /sys/firmware/devicetree/base ]; then
+    if grep -q pinephone compatible; then
+        DEVICE="pinephone"
+    fi
+fi
+
+pinephone_files="/sys/module/8723cs/parameters/rtw_scan_interval_thr /sys/power/state /sys/devices/platform/soc/1f00000.rtc/power/wakeup /sys/power/mem_sleep /sys/bus/usb/drivers/usb/unbind /sys/bus/usb/drivers/usb/bind /dev/rtc0 /sys/devices/platform/soc/1f03400.rsb/sunxi-rsb-3a3/axp221-pek/power/wakeup"
+
+if [ "$DEVICE" = "pinephone" ]; then
+    files="$pinephone_files"
+else
+    #guess a few that are hopefully fairly generic:
+    files="/sys/power/state /sys/power/mem_sleep /sys/bus/usb/drivers/usb/unbind /sys/bus/usb/drivers/usb/bind /dev/rtc0"
+    echo "Warning: SXMO is running on an unknown device, things may not work as expected!">&2
+fi
+
+for file in $files; do
+    [ -e "$file" ] && chmod a+rw "$file"
+done
+
+chmod a+rw /sys/class/wakeup/*