Fastbootd Fixes, Cleanup
-Fastbootd Fixes -Code Cleanup -Update Kernel -Replace system.prop - vendor.prop -Update version to v3
This commit is contained in:
ragarcia87
parent
019fc541a2
commit
b405279c99
21 changed files with 1012 additions and 447 deletions
|
|
@ -78,21 +78,6 @@ on property:sys.usb.ffs.ready=1
|
|||
symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
|
||||
on property:sys.usb.config=mtp && property:vendor.usb.use_ffs_mtp=1 && property:sys.usb.configfs=1
|
||||
rm /config/usb_gadget/g1/configs/b.1/f1
|
||||
symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
|
||||
|
||||
on property:sys.usb.config=mtp && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp"
|
||||
rm /config/usb_gadget/g1/configs/b.1/f2
|
||||
rm /config/usb_gadget/g1/configs/b.1/f3
|
||||
rm /config/usb_gadget/g1/configs/b.1/f4
|
||||
rm /config/usb_gadget/g1/configs/b.1/f5
|
||||
write /config/usb_gadget/g1/idVendor 0x0B05
|
||||
write /config/usb_gadget/g1/idProduct 0x7772
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=none && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/UDC "none"
|
||||
stop adbd
|
||||
|
|
@ -109,6 +94,7 @@ on property:sys.usb.config=none && property:sys.usb.configfs=1
|
|||
on property:init.svc.adbd=stopped
|
||||
setprop sys.usb.ffs.ready 0
|
||||
|
||||
# Recovery Mode- ADB & MTP
|
||||
on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
|
||||
start adbd
|
||||
|
||||
|
|
@ -128,6 +114,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:s
|
|||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
# Mass Storage USB Mode
|
||||
on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "msc"
|
||||
rm /config/usb_gadget/g1/configs/b.1/f1
|
||||
|
|
@ -145,6 +132,7 @@ on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
|
|||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
# Mass Storage & ADB USB Mode
|
||||
on property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
|
||||
start adbd
|
||||
|
||||
|
|
@ -166,10 +154,6 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && p
|
|||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:ro.boot.usbcontroller=*
|
||||
setprop sys.usb.controller ${ro.boot.usbcontroller}
|
||||
write /sys/class/udc/${ro.boot.usbcontroller}/device/../mode peripheral
|
||||
|
||||
# FastbootD ADB Functionality
|
||||
on property:sys.usb.config=adb && property:sys.usb.configfs=1
|
||||
start adbd
|
||||
|
|
|
|||
178
recovery/root/system/etc/init/hw/init.rc
Normal file
178
recovery/root/system/etc/init/hw/init.rc
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
import /init.recovery.${ro.hardware}.rc
|
||||
|
||||
on early-init
|
||||
# Set the security context of /postinstall if present.
|
||||
restorecon /postinstall
|
||||
|
||||
# Copy prebuilt ld.config.txt into linkerconfig directory
|
||||
copy /system/etc/ld.config.txt /linkerconfig/ld.config.txt
|
||||
chmod 444 /linkerconfig/ld.config.txt
|
||||
|
||||
start ueventd
|
||||
|
||||
setprop sys.usb.configfs 0
|
||||
|
||||
on init
|
||||
export ANDROID_ROOT /system
|
||||
export ANDROID_DATA /data
|
||||
export EXTERNAL_STORAGE /sdcard
|
||||
|
||||
symlink /proc/self/fd/0 /dev/stdin
|
||||
symlink /proc/self/fd/1 /dev/stdout
|
||||
symlink /proc/self/fd/2 /dev/stderr
|
||||
|
||||
symlink /system/bin /bin
|
||||
symlink /system/etc /etc
|
||||
|
||||
mount cgroup none /acct cpuacct
|
||||
mkdir /acct/uid
|
||||
|
||||
mkdir /sdcard
|
||||
mkdir /system
|
||||
mkdir /data
|
||||
mkdir /cache
|
||||
mkdir /sideload
|
||||
mkdir /mnt/system
|
||||
mount tmpfs tmpfs /tmp
|
||||
|
||||
chown root shell /tmp
|
||||
chmod 0775 /tmp
|
||||
|
||||
write /proc/sys/kernel/panic_on_oops 1
|
||||
write /proc/sys/vm/max_map_count 1000000
|
||||
|
||||
on boot
|
||||
ifup lo
|
||||
hostname localhost
|
||||
domainname localdomain
|
||||
|
||||
class_start default
|
||||
|
||||
on firmware_mounts_complete
|
||||
rm /dev/.booting
|
||||
|
||||
# Mount filesystems and start core system services.
|
||||
on late-init
|
||||
trigger early-fs
|
||||
trigger fs
|
||||
trigger post-fs
|
||||
trigger post-fs-data
|
||||
|
||||
# Remove a file to wake up anything waiting for firmware
|
||||
trigger firmware_mounts_complete
|
||||
|
||||
trigger early-boot
|
||||
trigger boot
|
||||
|
||||
service ueventd /system/bin/ueventd
|
||||
critical
|
||||
seclabel u:r:ueventd:s0
|
||||
|
||||
service charger /system/bin/charger
|
||||
critical
|
||||
seclabel u:r:charger:s0
|
||||
|
||||
service recovery /system/bin/recovery
|
||||
socket recovery stream 422 system system
|
||||
seclabel u:r:recovery:s0
|
||||
|
||||
service adbd /system/bin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery
|
||||
disabled
|
||||
socket adbd stream 660 system system
|
||||
seclabel u:r:adbd:s0
|
||||
|
||||
service fastbootd /system/bin/fastbootd
|
||||
disabled
|
||||
group system
|
||||
seclabel u:r:fastbootd:s0
|
||||
|
||||
# Restart adbd so it can run as root
|
||||
on property:service.adb.root=1
|
||||
restart adbd
|
||||
|
||||
on fs && property:sys.usb.configfs=1
|
||||
mount configfs none /config
|
||||
mkdir /config/usb_gadget/g1 0770 shell shell
|
||||
write /config/usb_gadget/g1/idVendor 0x18D1
|
||||
mkdir /config/usb_gadget/g1/strings/0x409 0770
|
||||
write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
|
||||
write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
|
||||
write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
|
||||
mkdir /config/usb_gadget/g1/functions/ffs.adb
|
||||
mkdir /config/usb_gadget/g1/functions/ffs.fastboot
|
||||
mkdir /config/usb_gadget/g1/configs/b.1 0777 shell shell
|
||||
mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
|
||||
|
||||
on fs && property:sys.usb.configfs=0
|
||||
write /sys/class/android_usb/android0/f_ffs/aliases adb,fastboot
|
||||
write /sys/class/android_usb/android0/idVendor 18D1
|
||||
write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
|
||||
write /sys/class/android_usb/android0/iProduct ${ro.product.model}
|
||||
write /sys/class/android_usb/android0/iSerial ${ro.serialno}
|
||||
|
||||
on fs
|
||||
mkdir /dev/usb-ffs 0775 shell shell
|
||||
mkdir /dev/usb-ffs/adb 0770 shell shell
|
||||
mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
|
||||
mkdir /dev/usb-ffs/fastboot 0770 system system
|
||||
mount functionfs fastboot /dev/usb-ffs/fastboot rmode=0770,fmode=0660,uid=1000,gid=1000
|
||||
|
||||
on property:sys.usb.config=adb
|
||||
start adbd
|
||||
|
||||
on property:sys.usb.config=fastboot
|
||||
start fastbootd
|
||||
|
||||
on property:sys.usb.config=none && property:sys.usb.configfs=0
|
||||
stop adbd
|
||||
stop fastbootd
|
||||
write /sys/class/android_usb/android0/enable 0
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=adb && property:sys.usb.configfs=0
|
||||
write /sys/class/android_usb/android0/idProduct D001
|
||||
write /sys/class/android_usb/android0/functions adb
|
||||
write /sys/class/android_usb/android0/enable 1
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=sideload && property:sys.usb.configfs=0
|
||||
write /sys/class/android_usb/android0/idProduct D001
|
||||
write /sys/class/android_usb/android0/functions adb
|
||||
write /sys/class/android_usb/android0/enable 1
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=fastboot && property:sys.usb.configfs=0
|
||||
write /sys/class/android_usb/android0/idProduct 4EE0
|
||||
write /sys/class/android_usb/android0/functions fastboot
|
||||
write /sys/class/android_usb/android0/enable 1
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
# Configfs triggers
|
||||
on property:sys.usb.config=none && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/UDC "none"
|
||||
stop adbd
|
||||
stop fastbootd
|
||||
setprop sys.usb.ffs.ready 0
|
||||
rm /config/usb_gadget/g1/configs/b.1/f1
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=sideload && property:sys.usb.ffs.ready=1 && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/idProduct 0xD001
|
||||
write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
|
||||
symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=adb && property:sys.usb.ffs.ready=1 && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/idProduct 0xD001
|
||||
write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
|
||||
symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
||||
on property:sys.usb.config=fastboot && property:sys.usb.ffs.ready=1 && property:sys.usb.configfs=1
|
||||
write /config/usb_gadget/g1/idProduct 0x4EE0
|
||||
write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "fastboot"
|
||||
symlink /config/usb_gadget/g1/functions/ffs.fastboot /config/usb_gadget/g1/configs/b.1/f1
|
||||
write /config/usb_gadget/g1/UDC ${sys.usb.controller}
|
||||
setprop sys.usb.state ${sys.usb.config}
|
||||
|
|
@ -1,45 +1,21 @@
|
|||
# Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted (subject to the limitations in the
|
||||
# disclaimer below) provided that the following conditions are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following
|
||||
# disclaimer in the documentation and/or other materials provided
|
||||
# with the distribution.
|
||||
#
|
||||
# * Neither the name of The Linux Foundation nor the names of its
|
||||
# contributors may be used to endorse or promote products derived
|
||||
# from this software without specific prior written permission.
|
||||
#
|
||||
# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
|
||||
# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
|
||||
# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||
# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
|
||||
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
|
||||
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
# 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>
|
||||
system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
|
||||
system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
|
||||
product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
|
||||
vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
|
||||
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
|
||||
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inlinecrypt,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=512M,sysfs_path=/sys/devices/platform/soc/4804000.ufshc,checkpoint=fs
|
||||
system /system ext4 ro,discard wait,slotselect,logical,first_stage_mount
|
||||
system_ext /system_ext ext4 ro,discard wait,slotselect,logical,first_stage_mount
|
||||
product /product ext4 ro,discard wait,slotselect,logical,first_stage_mount
|
||||
vendor /vendor ext4 ro,discard wait,slotselect,logical,first_stage_mount
|
||||
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,data=ordered,barrier=1 wait,check,formattable,first_stage_mount
|
||||
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,data=ordered,barrier=1 wait
|
||||
/dev/block/bootdevice/by-name/prodpersist /mnt/product/persist ext4 noatime,nosuid,nodev,data=ordered,barrier=1 wait,formattable,nofail
|
||||
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inlinecrypt,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,encryptable=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,sysfs_path=/sys/devices/platform/soc/4804000.ufshc,reservedsize=512M,checkpoint=fs
|
||||
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
|
||||
/dev/block/mmcblk1p1 /external_sd auto defaults defaults
|
||||
#/devices/platform/soc/4784000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto
|
||||
#/devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
|
||||
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt ext4 ro,nosuid,nodev,context=u:object_r:firmware_file:s0 wait,slotselect
|
||||
/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect
|
||||
/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware ext4 ro,nosuid,nodev,context=u:object_r:bt_firmware_file:s0 wait,slotselect
|
||||
/dev/block/bootdevice/by-name/fsg /vendor/fsg ext4 ro,nosuid,nodev,context=u:object_r:fsg_file:s0 wait,slotselect
|
||||
/dev/block/zram0 none swap defaults zramsize=75%
|
||||
BIN
recovery/root/system/etc/security/otacerts.zip
Normal file
BIN
recovery/root/system/etc/security/otacerts.zip
Normal file
Binary file not shown.
|
|
@ -5,7 +5,7 @@
|
|||
# mount point fstype device device2 flags
|
||||
|
||||
/metadata ext4 /dev/block/bootdevice/by-name/metadata flags=display="Metadata"
|
||||
/data ext4 /dev/block/bootdevice/by-name/userdata fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption
|
||||
/data f2fs /dev/block/bootdevice/by-name/userdata fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption
|
||||
/boot emmc /dev/block/bootdevice/by-name/boot flags=backup=1;flashimg=1;slotselect
|
||||
/dtbo emmc /dev/block/bootdevice/by-name/dtbo flags=backup=1;display="Dtbo";flashimg=1;slotselect
|
||||
/firmware vfat /dev/block/bootdevice/by-name/modem flags=display="Firmware";slotselect;mounttodecrypt;fsflags=ro
|
||||
|
|
@ -21,5 +21,5 @@
|
|||
/persist_image emmc /dev/block/bootdevice/by-name/persist flags=display="Persist";flashimg=1
|
||||
|
||||
# Removable storage
|
||||
/usbstorage vfat /dev/block/sdg1 /dev/block/sdg flags=fsflags=utf8;display="USB Storage";storage;wipeingui;removable
|
||||
/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="MicroSD";storage;wipeingui;removable
|
||||
/usbstorage auto /dev/block/sdg1 /dev/block/sdg flags=fsflags=utf8;display="USB-OTG";storage;wipeingui;removable
|
||||
/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display=""MicroSD-Card"";storage;wipeingui;removable
|
||||
Binary file not shown.
BIN
recovery/root/system/lib64/libandroidicu.so
Normal file
BIN
recovery/root/system/lib64/libandroidicu.so
Normal file
Binary file not shown.
BIN
recovery/root/vendor/lib/modules/mmi-smbcharger-iio.ko
vendored
Normal file
BIN
recovery/root/vendor/lib/modules/mmi-smbcharger-iio.ko
vendored
Normal file
Binary file not shown.
BIN
recovery/root/vendor/lib/modules/moto_f_usbnet.ko
vendored
Normal file
BIN
recovery/root/vendor/lib/modules/moto_f_usbnet.ko
vendored
Normal file
Binary file not shown.
BIN
recovery/root/vendor/lib/modules/nova_0flash_mmi.ko
vendored
Normal file
BIN
recovery/root/vendor/lib/modules/nova_0flash_mmi.ko
vendored
Normal file
Binary file not shown.
BIN
recovery/root/vendor/lib/modules/qpnp_adaptive_charge.ko
vendored
Normal file
BIN
recovery/root/vendor/lib/modules/qpnp_adaptive_charge.ko
vendored
Normal file
Binary file not shown.
BIN
recovery/root/vendor/lib/modules/utags.ko
vendored
Normal file
BIN
recovery/root/vendor/lib/modules/utags.ko
vendored
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue