diff options
author | Cody Ferber <codyf86@gmail.com> | 2013-12-15 15:45:29 -0500 |
---|---|---|
committer | Cody Ferber <codyf86@gmail.com> | 2014-01-04 14:21:58 -0500 |
commit | cbb387819c844227dac5340f57622caac84004e2 (patch) | |
tree | 7641abc7679fe5ec36b60ab1082f578de96af4de /rootdir | |
parent | ace0971e2d37d083808a994f2b0a04f6abd60011 (diff) | |
download | device_samsung_espressowifi-cbb387819c844227dac5340f57622caac84004e2.zip device_samsung_espressowifi-cbb387819c844227dac5340f57622caac84004e2.tar.gz device_samsung_espressowifi-cbb387819c844227dac5340f57622caac84004e2.tar.bz2 |
p3100 bring up (squashed commits)
SELinux: Remove redundant entry in device.te
https://github.com/codyf86/android_device_samsung_p3100/commit/83511bd8d41ead6d2b3156fba676838145889efe
SELinux: Fix redundant entry in file_contexts
https://github.com/codyf86/android_device_samsung_p3100/commit/1760227b238957c59081787815ea369741e09027
Update Wifi / fstab props; Start FUSE daemon (storage)
https://github.com/codyf86/android_device_samsung_p3100/commit/9def5325332be7b6c060c8c68e80e285736eda4c
Update permissions in init.espresso.rc
https://github.com/codyf86/android_device_samsung_p3100/commit/08f6ebf74c80f767ec0017da4194df27a6b6c64d
Cleanup common makefile
https://github.com/codyf86/android_device_samsung_p3100/commit/4e2be9fbc05ab22d5cfcc61df6be70a282369488
SELinux: Fix typo in file_contexts
https://github.com/codyf86/android_device_samsung_p3100/commit/61c55bb29d55b0015fdfdf6e4ccad90a9000b985
CommonMK: Update drawable settings
https://github.com/codyf86/android_device_samsung_p3100/commit/f03cc10d4941e7289d112c6e6d0b1eaf4d1f6d9b
Change-Id: I4e88d1d217d892f3ba6dba6dc5e4032301699bee
Diffstat (limited to 'rootdir')
-rw-r--r-- | rootdir/fstab.espresso | 4 | ||||
-rwxr-xr-x | rootdir/init.espresso.rc | 43 |
2 files changed, 33 insertions, 14 deletions
diff --git a/rootdir/fstab.espresso b/rootdir/fstab.espresso index b2e4217..54979b6 100644 --- a/rootdir/fstab.espresso +++ b/rootdir/fstab.espresso @@ -9,8 +9,8 @@ /dev/block/platform/omap/omap_hsmmc.1/by-name/CACHE /cache ext4 noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit wait,check # vold-managed volumes ("block device" is actually a sysfs devpath) -/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto -/devices/platform/omap/musb-omap2430/musb-hdrc/usb1 /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto +/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1 auto auto defaults voldmanaged=sdcard1:auto +/devices/platform/omap/musb-omap2430/musb-hdrc/usb1 auto auto defaults voldmanaged=usbdisk0:auto # recovery /dev/block/mmcblk0p5 /boot emmc defaults recoveryonly diff --git a/rootdir/init.espresso.rc b/rootdir/init.espresso.rc index d7680b5..6925764 100755 --- a/rootdir/init.espresso.rc +++ b/rootdir/init.espresso.rc @@ -2,10 +2,12 @@ import init.espresso.usb.rc on init mkdir /mnt/shell/emulated 0700 shell shell - mkdir /storage 0550 system sdcard_r + mkdir /storage 0751 root sdcard_r mkdir /storage/emulated 0555 root root - mkdir /storage/sdcard1 0775 system system - mkdir /storage/usbdisk0 0775 system system + mkdir /storage/sdcard1 0700 root root + mkdir /storage/usbdisk0 0700 root root + mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw + mkdir /mnt/media_rw/usbdisk0 0700 media_rw media_rw export EXTERNAL_STORAGE /storage/emulated/legacy export SECONDARY_STORAGE /storage/sdcard1 @@ -42,6 +44,7 @@ on fs mkdir /efs mount_all /fstab.espresso + # We chown/chmod /efs because mount is run as root + defaults chown radio system /efs chmod 0775 /efs @@ -313,13 +316,27 @@ service geomagneticd /system/bin/geomagneticd # create virtual SD card at /storage/sdcard0, based on the /data/media directory # daemon will drop to user/group system/media_rw after initializing # underlying files in /data/media will be created with user and group media_rw (1023) -service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023 +service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated class late_start + oneshot + +# FUSE sdcard daemon for rich permissions (runs as media_rw) +service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1 + class late_start + disabled + +service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk0 /storage/usbdisk0 + class late_start + disabled service p2p_supplicant /system/bin/wpa_supplicant \ - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \ - -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \ - -puse_p2p_group_interface=1 + -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -O/data/misc/wifi/sockets -N \ + -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/p2p_supplicant_overlay.conf \ + -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin \ + -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi @@ -330,8 +347,10 @@ service p2p_supplicant /system/bin/wpa_supplicant \ oneshot service wpa_supplicant /system/bin/wpa_supplicant \ - -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \ - -c/data/misc/wifi/wpa_supplicant.conf + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -O/data/misc/wifi/sockets \ + -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi @@ -389,9 +408,9 @@ service gpsd /system/bin/gpsd -c /system/etc/gps.xml # Keyboard service dock_kbd_attach /system/bin/dock_kbd_attach /dev/ttyO3 - class main - user root - oneshot + class main + user root + oneshot # LPM on property:ro.bootmode=charger |