galaxys2: recovery.rc cleanup, fstab cleanup
Change-Id: I38666e98f2536bdaf0721d1da6fccda3f9dd96ee
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 4e797d1..bfcc2b4 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -48,7 +48,6 @@
TARGET_PROVIDES_INIT := true
TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/samsung/galaxys2-common/rootdir/recovery.rc
BOARD_NAND_PAGE_SIZE := 4096
BOARD_NAND_SPARE_SIZE := 128
diff --git a/common.mk b/common.mk
index 7127338..aa9a068 100644
--- a/common.mk
+++ b/common.mk
@@ -17,7 +17,7 @@
DEVICE_PACKAGE_OVERLAYS := $(COMMON_PATH)/overlay
-# Init files
+# Rootdir
PRODUCT_COPY_FILES := \
$(COMMON_PATH)/rootdir/fstab.smdk4210:root/fstab.smdk4210 \
$(COMMON_PATH)/rootdir/lpm.rc:root/lpm.rc \
@@ -25,6 +25,10 @@
$(COMMON_PATH)/rootdir/init.smdk4210.rc:root/init.smdk4210.rc \
$(COMMON_PATH)/rootdir/ueventd.smdk4210.rc:root/ueventd.smdk4210.rc
+# Recovery rootdir
+PRODUCT_COPY_FILES += \
+ $(COMMON_PATH)/rootdir/init.recovery.smdk4210.rc:root/init.recovery.smdk4210.rc
+
# Audio
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/configs/tinyalsa-audio.xml:system/etc/tinyalsa-audio.xml \
diff --git a/rootdir/fstab.smdk4210 b/rootdir/fstab.smdk4210
index a0f807e..e3fd2e4 100755
--- a/rootdir/fstab.smdk4210
+++ b/rootdir/fstab.smdk4210
@@ -18,5 +18,3 @@
# recovery
/dev/block/mmcblk0p5 /boot emmc defaults recoveryonly
/dev/block/mmcblk0p6 /recovery emmc defaults recoveryonly
-/dev/block/mmcblk0p11 /emmc auto defaults recoveryonly
-/dev/block/mmcblk1p1 /sdcard auto defaults recoveryonly
diff --git a/rootdir/init.recovery.smdk4210.rc b/rootdir/init.recovery.smdk4210.rc
new file mode 100644
index 0000000..36f1fa8
--- /dev/null
+++ b/rootdir/init.recovery.smdk4210.rc
@@ -0,0 +1,9 @@
+on boot
+# Permissions for mDNIe
+ chown system media_rw /sys/class/mdnie/mdnie/mode
+ chown system media_rw /sys/class/mdnie/mdnie/outdoor
+ chown system media_rw /sys/class/mdnie/mdnie/scenario
+
+# Set mDNIe mode and scenario
+ write /sys/class/mdnie/mdnie/scenario 0
+ write /sys/class/mdnie/mdnie/mode 1
diff --git a/rootdir/recovery.rc b/rootdir/recovery.rc
deleted file mode 100644
index 844b2e3..0000000
--- a/rootdir/recovery.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-on early-init
- start ueventd
-
-on init
- export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
- export ANDROID_ROOT /system
- export ANDROID_DATA /data
- export ANDROID_CACHE /cache
- export SECONDARY_STORAGE /emmc
- export EXTERNAL_STORAGE /sdcard
-
- symlink /system/etc /etc
-
- mkdir /emmc
- mkdir /sdcard
- mkdir /usbdisk
- mkdir /system
- mkdir /data
- mkdir /cache
- mkdir /preload
- mount /tmp /tmp tmpfs
-
-on boot
-# Permissions for mDNIe
- chown system media_rw /sys/class/mdnie/mdnie/mode
- chown system media_rw /sys/class/mdnie/mdnie/outdoor
- chown system media_rw /sys/class/mdnie/mdnie/scenario
- write /sys/class/mdnie/mdnie/scenario 0
- write /sys/class/mdnie/mdnie/mode 1
-
- ifup lo
- hostname localhost
- domainname localdomain
-
- class_start default
-
-service ueventd /sbin/ueventd
- critical
-
-service console /sbin/sh
- class core
- console
- disabled
- group log
-
-on property:ro.debuggable=1
- start console
-
-service recovery /sbin/recovery
-
-service adbd /sbin/adbd recovery
- disabled
-
-# Always start adbd on userdebug and eng builds
-# In recovery, always run adbd as root.
-on property:ro.debuggable=1
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 04e8
- write /sys/class/android_usb/android0/idProduct 6860
- write /sys/class/android_usb/android0/functions adb
- write /sys/class/android_usb/android0/enable 1
- 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
- start adbd
- setprop service.adb.root 1
-
-# Restart adbd so it can run as root
-on property:service.adb.root=1
- write /sys/class/android_usb/android0/enable 0
- restart adbd
- write /sys/class/android_usb/android0/enable 1