shinano-common: init: Get rid of oem users

 * Camera can work without sony specific users.
   Remove them.

Change-Id: Idb359fa33532c1fa2b8f042362bb027f76ec31e4

4 files changed, 20 insertions, 20 deletions

diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index f1b9f7d..3f534fa 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -96,7 +96,7 @@ service taimport /system/bin/taimport
 service initcredmgr /system/bin/credmgrfirstboot.sh
     class late_start
     user system
-    group oem_5996
+    group cameraserver
     oneshot
 
 # When credmgrfirstboot is ready it set sys.credmgrdready=true.
@@ -119,8 +119,8 @@ service sct_service /system/bin/sct_service
  
 # Trim Area QMI service
 service ta_qmi_service /system/bin/ta_qmi_service
-    user oem_5998
-    group oem_5998 oem_5993 system root net_raw wakelock
+    user system
+    group system root net_raw wakelock
     disabled
 
 service scd /system/bin/scd
@@ -161,7 +161,7 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16
     seclabel u:r:tad:s0
 service updatemiscta /system/bin/updatemiscta
     class main
-    user oem_5991
-    group oem_5993
+    user system
+    group system
     oneshot
 
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 4c8dcc8..0985e2b 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -44,7 +44,7 @@ on init
     chown root system /proc/rdtag
 
     wait /dev/block/mmcblk0p1
-    chown oem_5997 oem_5997 /dev/block/mmcblk0p1
+    chown system system /dev/block/mmcblk0p1
     chmod 0770 /dev/block/mmcblk0p1
 
     # Bluetooth address setting
@@ -516,25 +516,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 oem_5993 camera drmrpc inet media mediadrm net_bt bluetooth net_bw_acct oem_2950
+    group audio 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 oem_5993
+    group drm system inet drmrpc readproc
 
 
 service media /system/bin/mediaserver
     class main
     user media
-    group audio camera inet net_bt bluetooth net_bw_acct drmrpc mediadrm oem_5996 system
+    group audio camera inet net_bt bluetooth net_bw_acct drmrpc mediadrm system
     ioprio rt 4
 
 service mediadrm /system/bin/mediadrmserver
     class main
     user media
-    group mediadrm drmrpc oem_5993
+    group mediadrm drmrpc
     ioprio rt 4
 
 service mpdecision /system/bin/mpdecision --avg_comp
diff --git a/rootdir/init.sony.rc b/rootdir/init.sony.rc
index e1e38a0..5748b19 100644
--- a/rootdir/init.sony.rc
+++ b/rootdir/init.sony.rc
@@ -2,10 +2,10 @@
 
 on fs
     # SONY: create mount point for idd
-    mkdir /idd 0751 oem_5987 oem_5987
+    mkdir /idd 0751 system system
 
     # SONY: setup idd partition
-    chown oem_5987 oem_5987 /idd
+    chown system system /idd
     chmod 0751 /idd
     exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found
     symlink /idd /mnt/idd
@@ -13,11 +13,11 @@ on fs
 
 on post-fs-data
     mkdir /idd/lost+found 0770 root root
-    mkdir /idd/output 0755 oem_5987 oem_5987
-    mkdir /idd/socket 0711 oem_5987 oem_5987
+    mkdir /idd/output 0755 system system
+    mkdir /idd/socket 0711 system system
     restorecon_recursive /idd
 
 service iddd /system/bin/iddd
     class main
-    user oem_5987
-    group oem_5987 log inet oem_5993
+    user system
+    group system log inet cameraserver media
diff --git a/rootdir/system/bin/credmgrfirstboot.sh b/rootdir/system/bin/credmgrfirstboot.sh
index 289f9b1..33062df 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 oem_5996 -type f -name "credmgr.db" | wc -l )
+CREDMGRCNT=$(find $CREDFOLDER -group system -type f -name "credmgr.db" | wc -l )
 
 echo -e "credmgr folder:\n$(ls -la $CREDFOLDER)\ncredmgr match (if any):" >> $LOG
-find $CREDFOLDER -group oem_5996 -type f -name "credmgr.db" >> $LOG
+find $CREDFOLDER -group system -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:oem_5996 $CREDFOLDER >> $LOG 2>&1
+	chown system:system $CREDFOLDER >> $LOG 2>&1
 	F_ERR $? "chown $CREDFOLDER"
 	chcon u:object_r:credmgrd_data_file:s0 $CREDFOLDER >> $LOG 2>&1
 	F_ERR $? "chcon $CREDFOLDER"
@@ -47,4 +47,4 @@ fi
 
 # Tell init we are ready
 setprop sys.credmgrdready true
-F_ERR $? "setting property"
\ No newline at end of file
+F_ERR $? "setting property"