smdk4412: remove vold.fstab and recovery.rc, reorg rootdir

Change-Id: Ibae8f76260001c0e1f672376db92c60c6d580c10

8 files changed, 5 insertions, 82 deletions

diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 18f4c62..13c8fed 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -52,7 +52,6 @@ TARGET_NO_RADIOIMAGE := true
 
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/samsung/smdk4412-common/recovery.rc
 
 TARGET_SPECIFIC_HEADER_PATH := device/samsung/smdk4412-common/overlay/include
 
diff --git a/common.mk b/common.mk
index d02c304..f11fc66 100644
--- a/common.mk
+++ b/common.mk
@@ -27,11 +27,11 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk)
 
 # Init files
 PRODUCT_COPY_FILES := \
-    $(COMMON_PATH)/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
-    $(COMMON_PATH)/lpm.rc:root/lpm.rc \
-    $(COMMON_PATH)/init.trace.rc:root/init.trace.rc \
-    $(COMMON_PATH)/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
-    $(COMMON_PATH)/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
+    $(COMMON_PATH)/rootdir/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
+    $(COMMON_PATH)/rootdir/lpm.rc:root/lpm.rc \
+    $(COMMON_PATH)/rootdir/init.trace.rc:root/init.trace.rc \
+    $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
+    $(COMMON_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
 
 # Audio
 PRODUCT_COPY_FILES += \
@@ -42,10 +42,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/80cfw:system/etc/init.d/80cfw
 
-# Vold and Storage
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/vold.fstab:system/etc/vold.fstab
-
 # Bluetooth configuration files
 PRODUCT_COPY_FILES += \
     system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf
diff --git a/configs/vold.fstab b/configs/vold.fstab
deleted file mode 100644
index 6efc0ee..0000000
--- a/configs/vold.fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-# external sdcard
-dev_mount sdcard1 /storage/sdcard1 auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1/
-
-# usbdisk
-dev_mount usbdisk0 /storage/usbdisk0 auto /devices/platform/s5p-ehci
diff --git a/recovery.rc b/recovery.rc
deleted file mode 100644
index 95559d9..0000000
--- a/recovery.rc
+++ /dev/null
@@ -1,67 +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 EXTERNAL_STORAGE /sdcard
-
-    mkdir /sdcard
-    mkdir /extSdCard
-    mkdir /external_sd
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mkdir /preload
-    mkdir /efs
-    mount /tmp /tmp tmpfs
-
-    chown root shell /tmp
-    chmod 0775 /tmp
-
-on boot
-    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
-on property:ro.debuggable=1
-    setprop adb.recovery 1
-
-on property:adb.recovery=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
diff --git a/init.smdk4x12.usb.rc b/rootdir/init.smdk4x12.usb.rc
index 72de75e..72de75e 100755
--- a/init.smdk4x12.usb.rc
+++ b/rootdir/init.smdk4x12.usb.rc
diff --git a/init.trace.rc b/rootdir/init.trace.rc
index 1d114f5..1d114f5 100755
--- a/init.trace.rc
+++ b/rootdir/init.trace.rc
diff --git a/lpm.rc b/rootdir/lpm.rc
index 2a94492..2a94492 100644
--- a/lpm.rc
+++ b/rootdir/lpm.rc
diff --git a/ueventd.smdk4x12.rc b/rootdir/ueventd.smdk4x12.rc
index 541eabb..541eabb 100644
--- a/ueventd.smdk4x12.rc
+++ b/rootdir/ueventd.smdk4x12.rc