From 3319a7ca9ec944b067cead2f3a822e7587a1d34e Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 26 Nov 2015 15:06:23 +0800
Subject: [PATCH] Update external storage configuration

Now vold manages external storage in a much more dynamic fashion,
so we no longer need to define FUSE daemons or mount points.

Google internal bug: 19993667
---
 fstab.x86   |  7 ++-----
 init.x86.rc | 51 ++-------------------------------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/fstab.x86 b/fstab.x86
index 569ea31..f2f61c8 100644
--- a/fstab.x86
+++ b/fstab.x86
@@ -1,6 +1,3 @@
-none	/cache		tmpfs	nosuid,nodev,noatime	defaults
+none			/cache		tmpfs	nosuid,nodev,noatime	defaults
 
-auto	/storage/usb0	vfat	defaults	wait,noemulatedsd,voldmanaged=usb0:auto
-auto	/storage/usb1	vfat	defaults	wait,noemulatedsd,voldmanaged=usb1:auto
-auto	/storage/usb2	vfat	defaults	wait,noemulatedsd,voldmanaged=usb2:auto
-auto	/storage/usb3	vfat	defaults	wait,noemulatedsd,voldmanaged=usb3:auto
+/devices/*/usb*/*	auto		auto	defaults		voldmanaged=usb:auto
diff --git a/init.x86.rc b/init.x86.rc
index c210752..467c3b8 100644
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -13,29 +13,8 @@ on early-init
 #   export EGL_DRIVERS egl_dri2
 
 on init
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-    mkdir /mnt/media_rw/usb0 0700 media_rw media_rw
-    mkdir /storage/usb0 0700 root root
-    mkdir /mnt/media_rw/usb1 0700 media_rw media_rw
-    mkdir /storage/usb1 0700 root root
-    mkdir /mnt/media_rw/usb2 0700 media_rw media_rw
-    mkdir /storage/usb2 0700 root root
-    mkdir /mnt/media_rw/usb3 0700 media_rw media_rw
-    mkdir /storage/usb3 0700 root root
-    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
-    mkdir /storage/sdcard1 0700 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-    export SECONDARY_STORAGE /storage/usb0:/storage/usb1:/storage/usb2:/storage/usb3:/storage/sdcard1
-
-    # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
 
     # Backward compatibility
     symlink system/lib /lib
@@ -48,13 +27,10 @@ on init
 
 on fs
     mount_all /fstab.${ro.hardware}
-    setprop ro.crypto.fuse_sdcard true
 
 on post-fs-data
     sysclktz 1
 
-    mkdir /data/media 0770 media_rw media_rw
-
     mkdir /data/misc/wifi 0770 wifi wifi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
@@ -126,29 +102,6 @@ service nativebridge /system/bin/enable_nativebridge
 service powerbtnd /system/bin/powerbtnd
     class late_start
 
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start
-
-service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
-    class late_start
-    disabled
-
-service fuse_usb0 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb0 /storage/usb0
-    class late_start
-    disabled
-
-service fuse_usb1 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb1 /storage/usb1
-    class late_start
-    disabled
-
-service fuse_usb2 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb2 /storage/usb2
-    class late_start
-    disabled
-
-service fuse_usb3 /system/bin/sdcard -u 1023 -g 1023 -w 1023 -d /mnt/media_rw/usb3 /storage/usb3
-    class late_start
-    disabled
-
 service logcat /system/bin/logcat -v threadtime -f /data/log.txt
     class debug
 
-- 
2.11.0