From 76f0ff1cc08e8488191e98c9ffab62ec4de59a6d Mon Sep 17 00:00:00 2001 From: nailyk-fr Date: Tue, 19 Sep 2017 20:53:26 +0200 Subject: shinano-common: init: Use obscur oreo UID/GID * With oreo all the AIDs process change. According to https://source.android.com/devices/tech/config/filesystem#using-an-oem-specific-aid user firendly names cannot be used anymore. Use oem_ name instead. See msm8974-common related change for reference. Change-Id: I18294c5ba716a6c2ba038b9f624f5ae65f799e1f --- rootdir/init.camera.rc | 26 +++++++++++++------------- rootdir/init.qcom.rc | 12 ++++++------ rootdir/init.sony.rc | 6 +++--- rootdir/system/bin/credmgrfirstboot.sh | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'rootdir') diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index 3025e8f..2ea39a7 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -24,7 +24,7 @@ on init on early-fs wait /dev/block/mmcblk0p1 - class_start trimarea + class_start oem_5993 exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static on early-boot @@ -91,7 +91,7 @@ service taimport /system/bin/taimport service initcredmgr /system/bin/credmgrfirstboot.sh class late_start user system - group credmgr_client + group oem_5996 oneshot # When credmgrfirstboot is ready it set sys.credmgrdready=true. @@ -102,8 +102,8 @@ start credmgrd # Start Credential manager daemon service credmgrd /system/bin/credmgrd user system - group credmgr_client - socket credmgr stream 0660 system credmgr_client + group oem_5996 + socket credmgr stream 0660 system oem_5996 disabled # Secure Config Transfer service @@ -113,8 +113,8 @@ service sct_service /system/bin/sct_service # Trim Area QMI service service ta_qmi_service /system/bin/ta_qmi_service - user ta_qmi - group ta_qmi trimarea system root net_raw wakelock + user oem_5998 + group oem_5998 oem_5993 system root net_raw wakelock disabled service scd /system/bin/scd @@ -140,22 +140,22 @@ service qcamerasvr /system/bin/mm-qcamera-daemon class late_start user camera # group camera system inet input graphics - group camera system inet input graphics credmgr_client cameraserver + group camera system inet input graphics oem_5996 cameraserver # seclabel u:r:mm-qcamerad:s0 -# SONY: TrimArea Daemon +# SONY: oem_5993 Daemon # Last 2 args: start block(blk size 128k), number of blocks(partitionsize(kb)/128(kb)) service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16 #service tad_static /sbin/tad_static /data/credmgr/ta_part.bin 0,16 - class trimarea - user tad - group tad trimarea root - socket tad stream 0770 system trimarea + class oem_5993 + user oem_5997 + group oem_5997 oem_5993 root + socket tad stream 0770 system oem_5993 # tad_static is in rootfs, normal file_context does not work seclabel u:r:tad:s0 service updatemiscta /system/bin/updatemiscta class main user updatemiscta - group trimarea + group oem_5993 oneshot diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 7136f8c..115be43 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -47,7 +47,7 @@ on init mkdir /dev/bus/usb 0755 root root wait /dev/block/mmcblk0p1 - chown tad tad /dev/block/mmcblk0p1 + chown oem_5997 oem_5997 /dev/block/mmcblk0p1 chmod 0770 /dev/block/mmcblk0p1 # Bluetooth address setting @@ -142,7 +142,7 @@ on boot # Wlan Interface Port setprop wifi.interface wlan0 - + # WiFi Firmware chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path @@ -519,25 +519,25 @@ service audioserver /system/bin/audioserver class main user audioserver # media gid needed for /dev/fm (radio) and for /data/misc/media (tee) - group audio trimarea camera drmrpc inet media mediadrm net_bt bluetooth net_bw_acct oem_2950 + group audio oem_5993 camera drmrpc inet media mediadrm net_bt bluetooth net_bw_acct oem_2950 ioprio rt 4 service drm /system/bin/drmserver class main user drm - group drm system inet drmrpc readproc trimarea + group drm system inet drmrpc readproc oem_5993 service media /system/bin/mediaserver class main user media - group audio camera inet net_bt bluetooth net_bw_acct drmrpc mediadrm credmgr_client system + group audio camera inet net_bt bluetooth net_bw_acct drmrpc mediadrm oem_5996 system ioprio rt 4 service mediadrm /system/bin/mediadrmserver class main user media - group mediadrm drmrpc trimarea + group mediadrm drmrpc oem_5993 ioprio rt 4 service mpdecision /system/bin/mpdecision --avg_comp diff --git a/rootdir/init.sony.rc b/rootdir/init.sony.rc index 7d450af..65d9f13 100644 --- a/rootdir/init.sony.rc +++ b/rootdir/init.sony.rc @@ -5,7 +5,7 @@ on fs mkdir /idd 0751 idd idd # SONY: setup idd partition - chown idd idd /idd + chown oem_5987 oem_5987 /idd chmod 0751 /idd exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found symlink /idd /mnt/idd @@ -19,5 +19,5 @@ on-post-fs-data service iddd /system/bin/iddd class main - user idd - group idd log inet trimarea \ No newline at end of file + user oem_5987 + group oem_5987 log inet oem_5993 diff --git a/rootdir/system/bin/credmgrfirstboot.sh b/rootdir/system/bin/credmgrfirstboot.sh index 20de77d..289f9b1 100755 --- a/rootdir/system/bin/credmgrfirstboot.sh +++ b/rootdir/system/bin/credmgrfirstboot.sh @@ -18,10 +18,10 @@ F_ERR(){ } # If credmgrd data doesn't match our -CREDMGRCNT=$(find $CREDFOLDER -group credmgr_client -type f -name "credmgr.db" | wc -l ) +CREDMGRCNT=$(find $CREDFOLDER -group oem_5996 -type f -name "credmgr.db" | wc -l ) echo -e "credmgr folder:\n$(ls -la $CREDFOLDER)\ncredmgr match (if any):" >> $LOG -find $CREDFOLDER -group credmgr_client -type f -name "credmgr.db" >> $LOG +find $CREDFOLDER -group oem_5996 -type f -name "credmgr.db" >> $LOG if [ "x$CREDMGRCNT" == "x0" ]; then @@ -34,7 +34,7 @@ if [ "x$CREDMGRCNT" == "x0" ]; then # Put binary into /cache mkdir $CREDFOLDER >> $LOG 2>&1 F_ERR $? "mkdir $CREDFOLDER" - chown system:credmgr_client $CREDFOLDER >> $LOG 2>&1 + chown system:oem_5996 $CREDFOLDER >> $LOG 2>&1 F_ERR $? "chown $CREDFOLDER" chcon u:object_r:credmgrd_data_file:s0 $CREDFOLDER >> $LOG 2>&1 F_ERR $? "chcon $CREDFOLDER" -- cgit v1.2.3