rootdir: overall update & cleanup

10 files changed, 48 insertions, 289 deletions

diff --git a/product/ramdisk.mk b/product/ramdisk.mk
index b43214a..2a774ab 100644
--- a/product/ramdisk.mk
+++ b/product/ramdisk.mk
@@ -3,14 +3,12 @@
      $(LOCAL_PATH)/rootdir/enableswap.sh:root/enableswap.sh \

      $(LOCAL_PATH)/rootdir/factory_init.project.rc:root/factory_init.project.rc \

      $(LOCAL_PATH)/rootdir/factory_init.rc:root/factory_init.rc \

-     $(LOCAL_PATH)/rootdir/fstab.charger:root/fstab.charger \

      $(LOCAL_PATH)/rootdir/fstab.mt6735:root/fstab.mt6735 \

      $(LOCAL_PATH)/rootdir/init.modem.rc:root/init.modem.rc \

      $(LOCAL_PATH)/rootdir/init.mt6735.rc:root/init.mt6735.rc \

      $(LOCAL_PATH)/rootdir/init.mt6735.usb.rc:root/init.mt6735.usb.rc \

      $(LOCAL_PATH)/rootdir/init.project.rc:root/init.project.rc \

      $(LOCAL_PATH)/rootdir/init.rc:root/init.rc \

-     $(LOCAL_PATH)/rootdir/init.ssd.rc:root/init.ssd.rc \

      $(LOCAL_PATH)/rootdir/meta_init.modem.rc:root/meta_init.modem.rc \

      $(LOCAL_PATH)/rootdir/meta_init.project.rc:root/meta_init.project.rc \

      $(LOCAL_PATH)/rootdir/meta_init.rc:root/meta_init.rc \

diff --git a/rootdir/factory_init.rc b/rootdir/factory_init.rc
index 912a134..a1715d1 100644
--- a/rootdir/factory_init.rc
+++ b/rootdir/factory_init.rc
@@ -1,7 +1,5 @@
 import /init.environ.rc
 import init.ssd.rc
-import init.no_ssd.rc
-import init.ssd_nomuser.rc
 import init.fon.rc
 import init.trustonic.rc
 
@@ -22,8 +20,6 @@ on early-init
     start ueventd
 
     write /proc/bootprof "INIT: usr/eng build setting"
-# create mountpoints
-    mkdir /mnt 0775 root system
 
 on init
 
@@ -46,6 +42,10 @@ loglevel 5
     symlink /dev/block/platform/mtk-msdc.0/by-name/nvram /dev/nvram   
     symlink /dev/block/platform/mtk-msdc.0/by-name/para /dev/misc
     symlink /dev/block/platform/mtk-msdc.0/by-name/logo /dev/logo 
+    #create mountpoint for persist partition
+    mkdir /persist 0771 system system
+#Create nvdata mount point
+    mkdir /nvdata 0771 system system
 
 
 # Link /vendor to /system/vendor for devices without a vendor partition.
@@ -56,28 +56,43 @@ loglevel 5
     mount cgroup none /acct cpuacct
     mkdir /acct/uid
 
-# Backwards Compat - XXX: Going away in G*
-    symlink /mnt/sdcard /sdcard
-
     mkdir /system
     mkdir /data 0771 system system
     mkdir /cache 0770 system cache
     mkdir /config 0500 root root
     mkdir /protect_f 0771 system system
     mkdir /protect_s 0771 system system
-    #create mountpoint for persist partition
-    mkdir /persist 0771 system system
-#Create nvdata mount point
-    mkdir /nvdata 0771 system system
 
+# Mount staging areas for devices managed by vold
     # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-    mkdir /mnt/media_rw 0700 media_rw media_rw
-    mkdir /storage 0751 root sdcard_r
-
-    # Filesystem image public mount points.
-    mkdir /mnt/obb 0700 root system
-    mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
+    mkdir /mnt 0755 root system
+    mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000
+    restorecon_recursive /mnt
+    # Support legacy paths
+    symlink /sdcard /mnt/sdcard
+
+    mkdir /mnt/secure 0700 root root
+    mkdir /mnt/secure/asec 0700 root root
+    mkdir /mnt/asec 0755 root system
+    mkdir /mnt/obb 0755 root system
+    mkdir /mnt/media_rw 0750 root media_rw
+    mkdir /mnt/user 0755 root root
+    mkdir /mnt/user/0 0755 root root
+    mkdir /mnt/expand 0771 system system
+
+    # Storage views to support runtime permissions
+    mkdir /storage 0755 root root
+    mkdir /mnt/runtime 0700 root root
+    mkdir /mnt/runtime/default 0755 root root
+    mkdir /mnt/runtime/default/self 0755 root root
+    mkdir /mnt/runtime/read 0755 root root
+    mkdir /mnt/runtime/read/self 0755 root root
+    mkdir /mnt/runtime/write 0755 root root
+    mkdir /mnt/runtime/write/self 0755 root root
+
+    # Symlink to keep legacy apps working in multi-user world
+    symlink /storage/self/primary /sdcard
+    symlink /mnt/user/0/primary /mnt/runtime/default/self/primary
 
     write /proc/sys/kernel/panic_on_oops 1
     write /proc/sys/kernel/hung_task_timeout_secs 0
diff --git a/rootdir/fstab.charger b/rootdir/fstab.charger
deleted file mode 100644
index c73e389..0000000
--- a/rootdir/fstab.charger
+++ /dev/null
@@ -1,10 +0,0 @@
-# Android fstab file.
-#<src>           <mnt_point>         <type>    <mnt_flags and options>                 <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-/dev/block/platform/mtk-msdc.0/by-name/userdata    /data               ext4      noatime,nosuid,nodev,noauto_da_alloc,discard                wait,check,resize,encryptable=footer
-
-#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
-#/dev/block/platform/mtk-msdc.0/by-name/custom     /custom      ext4   ro                                                         wait
diff --git a/rootdir/init.modem.rc b/rootdir/init.modem.rc
index 1ccbabe..fd1c2be 100755
--- a/rootdir/init.modem.rc
+++ b/rootdir/init.modem.rc
@@ -46,6 +46,8 @@ on post-fs-data
     # clear the sim switch flag
     setprop persist.radio.simswitch ""
 
+    setprop vold.post_fs_data_done 1
+
 service gsm0710muxd /system/bin/gsm0710muxd -s /dev/ttyC0 -f 512 -n 8 -m basic
     class core
     user root
@@ -114,12 +116,6 @@ service ril-daemon-mtkmd2 /system/bin/mtkrildmd2
 #  Modem related services (Begin)
 #
 
-service permission_check /system/bin/permission_check
-    class main
-    user root
-    group system radio
-    oneshot
-
 service ccci_fsd /system/bin/ccci_fsd 0
     user radio
     group radio system
@@ -138,27 +134,14 @@ service ccci_rpcd /system/bin/ccci_rpcd 0
     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
-    disabled
-    oneshot
-
-#Add by T.Zh for ppp daemon
-service pppd /system/bin/pppd file /data/misc/ppp/ppp_options
-    user root
-    disabled 
-    oneshot
 
 #
 #
 #  Modem related services (End)
 #
 
-#Add by hp.chen for 
-#
 #   Telephony Early Read service
-#
+
 service terservice /system/bin/terservice
     class core
     user radio
diff --git a/rootdir/init.mt6735.rc b/rootdir/init.mt6735.rc
index bcfbb81..af68fce 100755
--- a/rootdir/init.mt6735.rc
+++ b/rootdir/init.mt6735.rc
@@ -27,8 +27,6 @@ on init
     #mkdir /proinfo 0771 system system
     #mkdir /misc 0771 system system
 
-    mkdir /mnt/cd-rom 0000 system system
-
 # Change ION driver permission
     chmod 0644 /dev/ion
 
@@ -171,7 +169,6 @@ on post-fs-data
     mkdir /data/misc/wifi/hostapd 0771 system wifi
     restorecon /data/misc/wifi/hostapd
 
-    # Add by MTK
     # md32 boot
     chown root system /dev/md32
     chmod 0440 /dev/md32
@@ -477,9 +474,6 @@ on post-fs-data
     #EM eint
     chown root diag /sys/bus/platform/drivers/eint/current_eint
 
-    # for ppp options file
-    mkdir /data/misc/ppp 0770 bluetooth net_bt
-
     # Android SEC related device nodes
     chmod 0660 /dev/sec
     chown root system /dev/sec
@@ -551,10 +545,6 @@ on post-fs-data
     chmod 0660 /dev/MATV
     chown system media /dev/MATV
 
-    # otg_test
-    chown root radio /dev/mt_otg_test
-    chmod 0660 /dev/mt_otg_test
-
     # MDP
     chmod 0660 /dev/mt-mdp
     chown system media /dev/mt-mdp
@@ -768,6 +758,7 @@ service start_modem /system/bin/md_ctrl 1
     class main
     disabled
     oneshot
+
 # Define TCP buffer sizes for various networks
 #   ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
     setprop net.tcp.buffersize.default 4096,87380,524288,4096,16384,524288
@@ -787,11 +778,6 @@ service start_modem /system/bin/md_ctrl 1
 on property:persist.uartconsole.enable=1
     write /proc/mtprintk 1
 
-# Update the second boot logo
-service bootlogoupdater /system/bin/boot_logo_updater
-    class core
-    oneshot
-
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -B \
         -o /data/data/com.android.shell/files/bugreports/bugreport
@@ -800,10 +786,6 @@ service bugreport /system/bin/dumpstate -d -p -B \
     oneshot
     keycodes 114 115 116
 
-service netdiag /system/bin/netdiag
-    class main
-    socket netdiag stream 0664 root inet
-
 service nvram_daemon /system/bin/nvram_daemon
     class main
     user root
@@ -904,7 +886,7 @@ service autokd /system/bin/autokd
 #
 
 
-service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
+service dhcpcd_bt-pan /system/bin/dhcpcd -BK -dd
     class main
     user root
     group net_admin net_raw
@@ -939,69 +921,6 @@ service iprenew_p2p /system/bin/dhcpcd -n
     disabled
     oneshot
 
-service dhcp_inform /system/bin/dhcpcd -s -BK -A
-    class main
-    user root
-    group system radio dhcp net_admin net_raw
-    disabled
-    oneshot
-
-service dhcpv6_inform /system/bin/dhcp6c -c "/etc/wide-dhcpv6/dhcp6cSIP.conf" -fi
-    class main
-    user root
-    group system radio dhcp net_admin net_raw
-    disabled
-    oneshot
-
-service dhcp6cDNS_wlan0 /system/bin/dhcp6c -c "/etc/wide-dhcpv6/dhcp6cDNS.conf" -f wlan0
-    disabled
-    oneshot
-
-service dhcp6c_wlan0 /system/bin/dhcp6c -c "/etc/wide-dhcpv6/dhcp6c.conf" -f wlan0
-    disabled
-    oneshot
-
-on property:service.dhcp6c_wlan0.enable=0
-    stop dhcp6c_wlan0
-
-on property:service.dhcp6c_wlan0.enable=1
-    start dhcp6c_wlan0
-
-service dhcp6c_PD /system/bin/dhcp6c -c "/etc/wide-dhcpv6/dhcp6cPD.conf" -f
-    disabled
-    oneshot
-
-on property:service.pppoe_wlan0.enable=0
-    stop pppoe_wlan0
-
-on property:service.pppoe_wlan0.enable=1
-    start pppoe_wlan0
-
-# write proc for test sim
-    on property:gsm.sim.ril.testsim=0
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 0
-    write /proc/sys/net/ipv4/tcp_rto_min 200
-    on property:gsm.sim.ril.testsim=1
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 1
-    write /proc/sys/net/ipv4/tcp_rto_min 400
-    on property:gsm.sim.ril.testsim.2=0
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 0
-    write /proc/sys/net/ipv4/tcp_rto_min 200
-    on property:gsm.sim.ril.testsim.2=1
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 1
-    write /proc/sys/net/ipv4/tcp_rto_min 400
-    on property:gsm.sim.ril.testsim.3=0
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 0
-    write /proc/sys/net/ipv4/tcp_rto_min 200
-    on property:gsm.sim.ril.testsim.3=1
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 1
-    write /proc/sys/net/ipv4/tcp_rto_min 400
-    on property:gsm.sim.ril.testsim.4=0
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 0
-    write /proc/sys/net/ipv4/tcp_rto_min 200
-    on property:gsm.sim.ril.testsim.4=1
-    write /proc/sys/net/netfilter/nf_conntrack_tcp_no_window_check 1
-    write /proc/sys/net/ipv4/tcp_rto_min 400
 
 service PPLAgent /system/bin/ppl_agent
     class main
@@ -1013,19 +932,6 @@ service enableswap /system/bin/sh /enableswap.sh
     oneshot
     seclabel u:r:enableswap:s0
 
-#
-#  Modem related services (Begin)
-#
-service pppd_gprs /system/bin/pppd_dt /dev/ttyACM0 debug noauth refuse-eap usepeerdns nodetach
-    user root
-    group radio cache inet misc
-    disabled
-    oneshot
-
-#
-#  Modem related services (End)
-#
-
 service agpsd /system/bin/mtk_agpsd
     class main
     socket agpsd stream 660 gps system
@@ -1128,9 +1034,8 @@ service geomagneticd /system/bin/geomagneticd
     group system input
     class main
 
-#
-#emsvr service (start)
-#
+#emsvr service
+
 on property:ro.build.type=eng
     start emsvr
 
@@ -1150,10 +1055,6 @@ service emsvr /system/bin/em_svr
     user root
     group net_bt_stack
 
-#
-#emsvr service (end)
-#
-
 service NvRAMAgent /system/bin/nvram_agent_binder
     class main
     user system
@@ -1165,39 +1066,12 @@ service thermal_manager /system/bin/thermal_manager
     user root
     oneshot
 
-service thermal /system/bin/thermal
-    class main
-    user system
-    group system
-
-service thermald /system/bin/thermald
-    class main
-    user system
-    group system
-
 service fuelgauged /system/bin/fuelgauged
     class main
     user system
     group system
 
 
-#monitor battery status
-service batterywarning /system/bin/batterywarning
-    class main
-    user shell
-    group shell
-
-service MtkCodecService /system/bin/MtkCodecService
-    class main
-    user system
-    group audio media sdcard_r
-
-# GuiExt Server init
-service guiext-server /system/bin/guiext-server
-    class main
-    user system
-    group system graphics
-
 service kpoc_charger /system/bin/kpoc_charger
     class charger
 
diff --git a/rootdir/init.ssd.rc b/rootdir/init.ssd.rc
deleted file mode 100644
index ae081e1..0000000
--- a/rootdir/init.ssd.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-# MTK project .rc configure 
-
-on post-fs-data
-#
-# SHARED_SDCARD related directory & configuration (begin)
-#
-
-# we will remap this as /mnt/sdcard with the sdcard fuse tool
-		mkdir /data/media 0770 media_rw media_rw
-		chown media_rw media_rw /data/media
-		
-#
-# SHARED_SDCARD related directory & configuration (end)
-#
-
-on init
-    mount tmpfs tmpfs /storage/emulated mode=0755,uid=1023,gid=1023
-
-    # Support legacy paths
-    symlink /sdcard /mnt/sdcard
-    symlink /sdcard /storage/sdcard0
-
-on post-fs
-    # mount shared so changes propagate into child namespaces
-    mount rootfs rootfs / shared rec
-    mount tmpfs tmpfs /mnt/secure private rec
-
diff --git a/rootdir/init.trace.rc b/rootdir/init.trace.rc
deleted file mode 100755
index 9085e3d..0000000
--- a/rootdir/init.trace.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-## Permissions to allow system-wide tracing to the kernel trace buffer.
-##
-on boot
-
-# Allow writing to the kernel trace log.
-    mount debugfs debugfs /sys/kernel/debug
-    chmod 0755 /sys/kernel/debug
-    chmod 0222 /sys/kernel/debug/tracing/trace_marker
-
-# Allow the shell group to enable (some) kernel tracing.
-    chown root shell /sys/kernel/debug/tracing/trace_clock
-    chown system shell /sys/kernel/debug/tracing/buffer_size_kb
-    chown root shell /sys/kernel/debug/tracing/options/overwrite
-    chown root shell /sys/kernel/debug/tracing/options/record-cmd
-    chown root shell /sys/kernel/debug/tracing/events/sched/sched_switch/enable
-    chown root shell /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
-    chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
-    chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
-    chown root shell /sys/kernel/debug/tracing/events/power/clock_set_rate/enable
-    chown root shell /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
-    # change to system owner for AMS to control
-    chown system shell /sys/kernel/debug/tracing/tracing_on
-    chown system shell /sys/kernel/debug/tracing/tracing_enabled
-    chown root shell /sys/kernel/debug/tracing/set_event
-
-    chmod 0664 /sys/kernel/debug/tracing/trace_clock
-    chmod 0664 /sys/kernel/debug/tracing/buffer_size_kb
-    chmod 0664 /sys/kernel/debug/tracing/options/overwrite
-    chmod 0664 /sys/kernel/debug/tracing/options/record-cmd
-    chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_switch/enable
-    chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
-    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
-    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable
-    chmod 0664 /sys/kernel/debug/tracing/events/power/clock_set_rate/enable
-    chmod 0664 /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
-    chmod 0664 /sys/kernel/debug/tracing/tracing_on
-    chmod 0664 /sys/kernel/debug/tracing/tracing_enabled
-    chmod 0664 /sys/kernel/debug/tracing/set_event
-
-# Allow only the shell group to read and truncate the kernel trace.
-    chown system shell /sys/kernel/debug/tracing/trace
-    chmod 0664 /sys/kernel/debug/tracing/trace
diff --git a/rootdir/meta_init.rc b/rootdir/meta_init.rc
index bdadd70..9723bc4 100644
--- a/rootdir/meta_init.rc
+++ b/rootdir/meta_init.rc
@@ -4,11 +4,12 @@
 # This is a common source of Android security bugs.
 #
 import /init.environ.rc
-import init.ssd.rc
-import init.no_ssd.rc
-import init.ssd_nomuser.rc
 import init.fon.rc
 import init.trustonic.rc
+import meta_init.project.rc
+#Make sure meta_init.modem.rc is the last rc file.
+import meta_init.modem.rc
+import init.microtrust.rc
 
 on early-init
     # Set init and its forked children's oom_adj.
@@ -26,9 +27,6 @@ on early-init
 
     start ueventd
 
-# create mountpoints
-    mkdir /mnt 0775 root system
-
 on init
     sysclktz 0
 
@@ -113,11 +111,6 @@ loglevel 5
     #Create CIP mount point
     mkdir /custom
 
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-    mkdir /mnt/media_rw 0700 media_rw media_rw
-    mkdir /storage 0751 root sdcard_r
-
     mkdir /mnt/cd-rom 0000 system system
 
 
@@ -251,13 +244,8 @@ on post-fs-data
     # Do not place files or directories in /data/local/tmp
     mkdir /data/local/tmp 0771 shell shell
     mkdir /data/data 0771 system system
-    mkdir /data/app-private 0771 system system
-    mkdir /data/app-asec 0700 root root
-    mkdir /data/app 0771 system system
     mkdir /data/property 0700 root root
     mkdir /data/tombstones 0771 system system
-    mkdir /data/ssh 0750 root shell
-    mkdir /data/ssh/empty 0700 root root
 
     # create the lost+found directories, so as to enforce our permissions
     mkdir /data/lost+found 0770
diff --git a/rootdir/recovery.fstab b/rootdir/recovery.fstab
deleted file mode 100644
index 613895c..0000000
--- a/rootdir/recovery.fstab
+++ /dev/null
@@ -1,19 +0,0 @@
-# Android fstab file.
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-#<src>          <mnt_point>        <type>       <mnt_flags and options>       <fs_mgr_flags>
-
-/dev/block/platform/mtk-msdc.0/by-name/boot      /boot             emmc         defaults                     defaults
-/dev/block/platform/mtk-msdc.0/by-name/nvram        /nvram            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,noatime          wait
-/dev/block/platform/mtk-msdc.0/by-name/cache       /cache        ext4      noatime,nosuid,nodev,noauto_da_alloc     wait
-/dev/block/platform/mtk-msdc.0/by-name/userdata    /data               ext4      noatime,nosuid,nodev,noauto_da_alloc    wait,check,encryptable=footer
-/dev/block/platform/mtk-msdc.0/by-name/protect1   /protect_f          ext4      noatime,nosuid,nodev,noauto_da_alloc    wait,check
-/dev/block/platform/mtk-msdc.0/by-name/protect2   /protect_s          ext4      noatime,nosuid,nodev,noauto_da_alloc    wait,check
-
-# vold-managed volumes
-/devices/platform/mtk-msdc.0/mmc_host/mmc0      auto     auto    defaults voldmanaged=sdcard0:16
-/devices/platform/mtk-msdc.1/mmc_host/mmc1      auto     auto    defaults voldmanaged=sdcard1:auto
diff --git a/rootdir/ueventd.mt6735.rc b/rootdir/ueventd.mt6735.rc
index fe0d94d..b0235c9 100644
--- a/rootdir/ueventd.mt6735.rc
+++ b/rootdir/ueventd.mt6735.rc
@@ -67,7 +67,6 @@ subsystem adf
 # Anyone can read the logs, but if they're not in the "logs"
 # group, then they'll only see log entries for their UID.
 /dev/xLog                 0600   root       root
-/dev/log/*                0666   root       log
 /dev/log/ksystem          0600   root       log
 
 # the msm hw3d client device node is world writable/readable
@@ -139,13 +138,13 @@ subsystem adf
 /dev/usb_accessory        0660   root       usb
 /dev/tun                  0660   system     vpn
 
-/dev/ccci*                0660   radio       radio
-/dev/ttyC*                0660   radio       radio
+/dev/ccci*                0660   radio      radio
+/dev/ttyC*                0660   radio      radio
 /sys/kernel/ccci          modem_info   0644   radio       radio
 /sys/kernel/ccci          md1_postfix  0644   radio       radio
 /sys/kernel/ccci          md2_postfix  0644   radio       radio
-/dev/eemcs*               0660   radio       radio
-/dev/emd*                 0660   radio       radio
+/dev/eemcs*               0660   radio      radio
+/dev/emd*                 0660   radio      radio
 /dev/ccci_pcm_rx          0660   media      media
 /dev/ccci_pcm_tx          0660   media      media
 /dev/ccci_aud             0660   media      media