Update fstab.mt6753

fstab: don't mount /custom

add more MTK ril specifics

unneeded

Update init.mt6735.rc

Update init.rc

clean init.modem.rc

clean up

fix build

add product_packages gsm0710muxd

fix /proc/cmdline: open failed

D/TelephonyManager(  314): No /proc/cmdline exception=java.io.FileNotFoundException: /proc/cmdline: open failed: EACCES (Permission denied)

6 files changed, 48 insertions, 136 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 50847ef..0da622f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,7 +36,6 @@ TARGET_USES_64_BIT_BINDER := true
 TARGET_IS_64_BIT := true
 TARGET_CPU_CORTEX_A53 := true
  
-TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_NO_FACTORYIMAGE := true
  
 TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI)
diff --git a/device_m2note.mk b/device_m2note.mk
index ee71ffa..269f6d8 100644
--- a/device_m2note.mk
+++ b/device_m2note.mk
@@ -58,6 +58,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	Snap
 
+# RIL
+PRODUCT_PACKAGES += \
+	gsm0710muxd
 
 # Bluetooth
 PRODUCT_PACKAGES += \
@@ -164,4 +167,12 @@ ADDITIONAL_DEFAULT_PROPERTIES += \
 	ro.adb.secure=1 \
 	persist.service.acm.enable=0 \
 	ro.oem_unlock_supported=1 \
-	persist.sys.usb.config=mtp
+	persist.radio.multisim.config=dsds \
+	ro.mtk_lte_support=1 \
+	ro.telephony.ril_class=MediaTekRIL \
+	ro.telephony.ril.config=fakeiccid \
+	ro.telephony.sim.count=2 \
+	persist.gemini.sim_num=2 \
+	ril.current.share_modem=2 \
+	persist.debug.xlog.enable=1
+
diff --git a/recovery/root/fstab.mt6753 b/recovery/root/fstab.mt6753
index 3301705..add7b23 100644
--- a/recovery/root/fstab.mt6753
+++ b/recovery/root/fstab.mt6753
@@ -1,7 +1,6 @@
 /dev/block/platform/mtk-msdc.0/by-name/boot       /boot        emmc    defaults    defaults
 /dev/block/platform/mtk-msdc.0/by-name/recovery   /recovery    emmc    defaults    defaults
 /dev/block/platform/mtk-msdc.0/by-name/system     /system      ext4   ro						         wait
-/dev/block/platform/mtk-msdc.0/by-name/custom     /custom      ext4   rw						         wait
 /dev/block/platform/mtk-msdc.0/by-name/userdata   /data        ext4   noatime,nosuid,nodev,noauto_da_alloc,discard               wait,check,resize,encryptable=/dev/block/platform/mtk-msdc.0/by-name/metadata
 /dev/block/platform/mtk-msdc.0/by-name/cache      /cache       ext4   noatime,nosuid,nodev,noauto_da_alloc,discard               wait,check
 /dev/block/platform/mtk-msdc.0/by-name/protect1   /protect_f   ext4   noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc   wait,check,autoformat
@@ -10,6 +9,6 @@
 
 #please add cip or persist on project fstab
 #/dev/block/platform/mtk-msdc.0/by-name/persist    /persist     ext4   noatime,nosuid,nodev,noauto_da_alloc,commit=1,nodelalloc   wait,check,autoformat
-/devices/mtk-msdc.0/11230000.MSDC0   auto      vfat      defaults        voldmanaged=sdcard0:emmc@intsd,noemulatedsd
-/devices/mtk-msdc.0/11240000.MSDC1  auto      auto      defaults        voldmanaged=sdcard1:auto
-/devices/platform/mt_usb                auto      auto      defaults        voldmanaged=usbotg:auto
+/devices/mtk-msdc.0/11230000.MSDC0*   auto      vfat      defaults        voldmanaged=sdcard0:emmc@intsd,noemulatedsd
+/devices/mtk-msdc.0/11240000.MSDC1*  auto      auto      defaults        voldmanaged=sdcard1:auto,noemulatedsd
+/devices/platform/mt_usb                auto      auto      defaults        voldmanaged=usbotg:auto,noemulatedsd
diff --git a/rootdir/init.modem.rc b/rootdir/init.modem.rc
index a591aae..772829c 100644
--- a/rootdir/init.modem.rc
+++ b/rootdir/init.modem.rc
@@ -11,11 +11,6 @@ on post-fs-data
     # Modem related device nodes
     mkdir /data/nvram/md  0770 root system
 
-#  Build-in Modified - S
-#    insmod /system/lib/modules/ccci_plat.ko
-#    insmod /system/lib/modules/ccci.ko
-#  Build-in Modified - E
-#   chown radio radio /sys/class/BOOT/BOOT/boot/md
     chown radio radio /sys/kernel/ccci/boot
 
 #SeLinux
@@ -37,13 +32,6 @@ service gsm0710muxdmd2 /system/bin/gsm0710muxdmd2 -s /dev/ccci2_tty0 -f 512 -n 8
     group radio cache inet misc
     disabled
     oneshot
-    
-service muxreport-daemon /system/bin/muxreport
-    class core
-    user radio
-    group radio cache inet misc
-    disabled
-    oneshot
 
 service ril-daemon-mtk /system/bin/mtkrild
     class core
@@ -80,11 +68,6 @@ service ril-daemon-mtkmd2 /system/bin/mtkrildmd2
     disabled
     oneshot
 
-service md_minilog_util /system/bin/md_minilog_util
-    user radio
-    disabled
-    oneshot
-
 #
 #  Modem related services (Begin)
 #
@@ -107,12 +90,6 @@ service ccci_mdinit /system/bin/ccci_mdinit 0
     class core
     oneshot
 
-service ccci_rpcd /system/bin/ccci_rpcd 0
-    user radio
-    group radio system
-    class core
-    oneshot
-
 service pppd_gprs /system/bin/pppd_dt /dev/ttyACM0 debug noauth refuse-eap usepeerdns nodetach
     user root
     group radio cache inet misc
@@ -129,17 +106,3 @@ service pppd /system/bin/pppd file /data/misc/ppp/ppp_options
 #
 #  Modem related services (End)
 #
-
-#Add by hp.chen for 
-#
-#   Telephony Early Read service
-#
-service terservice /system/bin/terservice
-    class core
-    user radio
-    group radio cache inet misc
-    oneshot
-
-on property:ril.muxreport=1
-    start muxreport-daemon
-
diff --git a/rootdir/init.mt6735.rc b/rootdir/init.mt6735.rc
index 5f0f856..5f5762a 100644
--- a/rootdir/init.mt6735.rc
+++ b/rootdir/init.mt6735.rc
@@ -78,6 +78,8 @@ on fs
 #   mount iso9660 loop@/system/etc/iAmCdRom.iso /mnt/cd-rom ro
 
 on post-fs
+    chmod 0660 /dev/block/platform/mtk-msdc.0/by-name/nvram
+    chown root system /dev/block/platform/mtk-msdc.0/by-name/nvram
     #change permissions for mediaserver
     chown root media /proc/clkmgr/mipi_test
 
@@ -616,6 +618,8 @@ on boot
 
     # xlog
     start xlogboot
+    
+    chmod 0444 /proc/cmdline
 
     write /proc/sys/vm/dirty_writeback_centisecs 300
     chmod 0660 /sys/power/autosleep
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7e27705..3dcf15c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -9,6 +9,9 @@ import /init.usb.rc
 import /init.${ro.hardware}.rc
 import /init.${ro.zygote}.rc
 import /init.trace.rc
+# Include CM's extra init file
+import /init.cm.rc
+
 
 on early-init
     # Set init and its forked children's oom_adj.
@@ -32,8 +35,7 @@ on early-init
 on init
     sysclktz 0
 
-loglevel 6 ####
-    write /proc/bootprof "INIT: on init start" ####
+    loglevel 3
 
     # Backward compatibility
     symlink /system/etc /etc
@@ -60,6 +62,7 @@ loglevel 6 ####
     write /sys/fs/cgroup/memory/sw/memory.move_charge_at_immigrate 1
     chown root system /sys/fs/cgroup/memory/sw/tasks
     chmod 0660 /sys/fs/cgroup/memory/sw/tasks
+    chmod 0220 /sys/fs/cgroup/memory/cgroup.event_control
 
     mkdir /system
     mkdir /data 0771 system system
@@ -152,9 +155,6 @@ loglevel 6 ####
     chown system log /sys/fs/pstore/console-ramoops
     chmod 0440 /sys/fs/pstore/console-ramoops
 
-	# ion device
-	chmod 0666 /dev/ion
-
 # Healthd can trigger a full boot from charger mode by signaling this
 # property when the power button is held.
 on property:sys.boot_from_charger_mode=1
@@ -254,6 +254,7 @@ on post-fs-data
     # create basic filesystem structure
     mkdir /data/misc 01771 system misc
     mkdir /data/misc/adb 02750 system shell
+    mkdir /data/misc/audit 02750 audit system
     mkdir /data/misc/bluedroid 0770 bluetooth net_bt_stack
     mkdir /data/misc/bluetooth 0770 system system
     mkdir /data/misc/keystore 0700 keystore keystore
@@ -300,8 +301,7 @@ on post-fs-data
 
     # create directory for DRM plug-ins - give drm the read/write access to
     # the following directory.
-    mkdir /data/drm 0770 drm drm ####
-    # mkdir /data/drm 0774 drm system ####
+    mkdir /data/drm 0770 drm drm
 
     # create directory for MediaDrm plug-ins - give drm the read/write access to
     # the following directory.
@@ -315,15 +315,14 @@ on post-fs-data
     # Separate location for storing security policy files on data
     mkdir /data/security 0711 system system
 
-    # add for mediaserver data
-    mkdir /data/mediaserver 0775 media media
-    restorecon /data/mediaserver
-
     # Reload policy from /data/security if present.
     setprop selinux.reload_policy 1
 
     # Set SELinux security contexts on upgrade or policy update.
     restorecon_recursive /data
+    restorecon /data/data
+    restorecon /data/user
+    restorecon /data/user/0
 
     # If there is no fs-post-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems
@@ -331,15 +330,6 @@ on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     #setprop vold.post_fs_data_done 1
 
-    # Flyme kuangqianbo for samba server and client {@
-    mkdir /data/misc/samba 0775 system system
-    mkdir /data/misc/samba/remote 0775 system system
-    mkdir /data/misc/samba/lib 0775 system system
-    mkdir /data/misc/samba/private 0775 system system
-    mkdir /data/misc/samba/tmp 0775 system system
-    mkdir /data/misc/samba/var 0775 system system
-    # @}
-
 on boot
     # basic network init
     ifup lo
@@ -412,6 +402,7 @@ on boot
     chown system system /sys/class/timed_output/vibrator/enable
     chown system system /sys/class/leds/keyboard-backlight/brightness
     chown system system /sys/class/leds/lcd-backlight/brightness
+    chown system system /sys/class/leds/torch-light/brightness
     chown system system /sys/class/leds/button-backlight/brightness
     chown system system /sys/class/leds/jogball-backlight/brightness
     chown system system /sys/class/leds/red/brightness
@@ -508,10 +499,16 @@ service healthd /sbin/healthd
 service console /system/bin/sh
     class core
     console
-#   disabled
-#   user shell
+    disabled
+    user shell
+    group shell log
     seclabel u:r:shell:s0
 
+service auditd /system/bin/auditd -k
+    seclabel u:r:logd:s0
+    class main
+
+
 on property:ro.debuggable=1
     start console
 
@@ -542,57 +539,6 @@ service servicemanager /system/bin/servicemanager
     onrestart restart surfaceflinger
     onrestart restart drm
 
-# Flyme kuangqianbo add forwifi share
-service smbd /system/bin/smbd -D
-    user root
-    group bluetooth net_bt_admin
-    disabled
-    oneshot
-
-service nmbd /system/bin/nmbd -D
-    user root
-    group bluetooth net_bt_admin
-    disabled
-    oneshot
-
-# Flyme wifi share end
-
-# FLYME:duxiaolei@Feature {@
-on post-fs-data
-    # For pppoe
-    mkdir /data/pppoe 0770
-    chown root system /data/pppoe
-
-#pppoe
-service pppd_pppoe /system/bin/sh /system/etc/ppp/init.pppoe-pppd
-    user root
-    group radio cache inet misc
-    oneshot
-    disabled
-
-on property:net.pppoe=start
-   start pppd_pppoe
-
-on property:net.pppoe=stop
-   stop pppd_pppoe
-#pppoe end
-
-#wifi test
-service wifi_test_mode  /system/bin/wifitest
-    user root
-    group bluetooth net_bt_admin
-    disabled
-    oneshot
-
-on property:meizu.wifi.test=start
-    start wifi_test_mode
-
-on property:meizu.wifi.test=stop
-    stop wifi_test_mode
-#wifi test end
-
-# @}
-
 service vold /system/bin/vold
     class core
     socket vold stream 0660 root mount
@@ -605,25 +551,18 @@ service netd /system/bin/netd
     socket mdns stream 0660 root system
     socket fwmarkd stream 0660 root inet
 
-# Flyme kuangqianbo add for meizu own daemon { @
-service flymed /system/bin/flymed
-    class main
-    socket flymed stream 0660 root system
-# @ }
-
 service debuggerd /system/bin/debuggerd
     class main
 
 service debuggerd64 /system/bin/debuggerd64
     class main
 
-# for using TK init.modem.rc rild-daemon setting
 #service ril-daemon /system/bin/rild
 #    class main
 #    socket rild stream 660 root radio
 #    socket rild-debug stream 660 radio system
 #    user root
-#    group radio cache inet misc audio log
+#    group radio cache inet misc audio sdcard_rw qcom_diag log
 
 service surfaceflinger /system/bin/surfaceflinger
     class core
@@ -631,22 +570,15 @@ service surfaceflinger /system/bin/surfaceflinger
     group graphics drmrpc
     onrestart restart zygote
 
-#make sure drm server has rights to read and write sdcard ####
 service drm /system/bin/drmserver
     class main
     user drm
-    # group drm system inet drmrpc ####
-    group drm system inet drmrpc sdcard_r ####
+    group drm system inet drmrpc
 
 service media /system/bin/mediaserver
     class main
-    user root ####
-#   google default ####
-#   user media    ####
-    group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm media sdcard_r system net_bt_stack ####
-#   google default ####
-#   group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm ####
-
+    user root
+    group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm qcom_diag system
     ioprio rt 4
 
 # One shot invocation to deal with encrypted volume.
@@ -666,8 +598,7 @@ service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
 service bootanim /system/bin/bootanimation
     class core
     user graphics
-#    group graphics audio ####
-    group graphics media audio ####
+    group graphics audio
     disabled
     oneshot
 
@@ -679,6 +610,11 @@ service flash_recovery /system/bin/install-recovery.sh
     class main
     seclabel u:r:install_recovery:s0
     oneshot
+    disabled
+
+# update recovery if enabled
+on property:persist.sys.recovery_update=true
+    start flash_recovery
 
 service racoon /system/bin/racoon
     class main