Update for cativatemmtd

jb_combo_c/ics_init/init.rc

@@ -21,6 +21,17 @@ on early-init
 
 # create mountpoints
     mkdir /mnt 0775 root system
+    mkdir /storage 0050 root sdcard_r
+    # Create mountpoint so Dalvik can mark as slave in zygotes.
+    mount tmpfs tmpfs /storage mode=0050,uid=0,gid=1028
+
+    # Allow system UID to setenforce and set booleans.
+    chown system system /selinux/enforce
+    chown system system /sys/fs/selinux/enforce
+    chown -R system system /selinux/booleans
+    chown -R system system /sys/fs/selinux/booleans
+    chown system system /selinux/commit_pending_bools
+    chown system system /sys/fs/selinux/commit_pending_bools
 
     # Allow system UID to setenforce and set booleans.
     chown system system /selinux/enforce
@@ -70,6 +81,7 @@ loglevel 3
 
     # See storage config details at http://source.android.com/tech/storage/
     mkdir /mnt/shell 0700 shell shell
+    # Ensure permissions are set appropriately after device early-init.
     mkdir /storage 0050 root sdcard_r
 
     # Directory for putting things only root should see.

jb_combo_c/ics_rec_init/default.prop

@@ -21,10 +21,10 @@ ro.build.type=userdebug
 ro.build.user=jenkins
 ro.build.host=cyanogenmod
 ro.build.tags=test-keys
-ro.product.model=SGH-I897
+ro.product.model=GT-I9000
 ro.product.brand=samsung
-ro.product.name=full_captivatemtd
-ro.product.device=captivatemtd
+ro.product.name=GT-I9000
+ro.product.device=GT-I9000
 ro.product.board=aries
 ro.product.cpu.abi=armeabi-v7a
 ro.product.cpu.abi2=armeabi
@@ -34,12 +34,12 @@ ro.product.locale.region=US
 ro.wifi.channels=
 ro.board.platform=s5pc110
 # ro.build.product is obsolete; use ro.product.device
-ro.build.product=captivatemtd
+ro.build.product=GT-I9000
 # Do not try to parse ro.build.description or .fingerprint
 ro.build.description=GT-I9000-user 2.3.5 GINGERBREAD XXJVT release-keys
 ro.build.fingerprint=samsung/GT-I9000/GT-I9000:2.3.5/GINGERBREAD/XXJVT:user/release-keys
 ro.build.characteristics=default
-ro.cm.device=captivatemtd
+ro.cm.device=galaxysmtd
 # end build properties
 #
 # system.prop for smdkc110

jb_combo_c/ics_rec_init/sbin/setupdatadata.sh

@@ -9,12 +9,11 @@ PATH=/system/bin/:/system/xbin/
 
 function migrate_datadata {
     # Migrate data from /datadata to /data/data
-    if test -h /data/data ; then
-        rm /data/data
-        mkdir /data/data
-        chown system.system /data/data
-        chmod 0771 /data/data
-        cp -a /datadata/* /data/data/
+    if test -d /datadata/com.android.settings ; then
+        busybox mv -f /datadata/* /data/data/
+        # FIXME: restorecon might not restore the same context as original
+        # (remove when busybox has SELinux support)
+        restorecon -r /data/data
         touch /data/data/.nodatadata
         rm -r /data/data/lost+found
         busybox umount /datadata
@@ -27,10 +26,15 @@ function migrate_cache {
     if test -e /data/data/$1 ; then
         if ! test -h /data/data/$1/cache ; then
             OWNER="`ls -ld /data/data/$1/ | awk '{print $3}'`"
+            CONTEXT="`ls -Zd /data/data/$1/ | awk '{print $4}'`"
             rm -r /data/data2/$1 # In case it exists
             mkdir -p /data/data2/$1
             chmod 751 /data/data2/$1
+            chcon $CONTEXT /data/data2/$1
             busybox mv -f /data/data/$1/cache /data/data2/$1/
+            # FIXME: restorecon might not restore the same context as original
+            # (remove when busybox has SELinux support)
+            restorecon -r /data/data2/$1/*
             ln -s /data/data2/$1/cache /data/data/$1/cache
             chown $OWNER.$OWNER /data/data2/$1 /data/data2/$1/cache
             busybox chown -h $OWNER.$OWNER /data/data/$1/cache
@@ -47,14 +51,21 @@ function migrate_cache {
 CRYPTO_STATE="`getprop ro.crypto.state`"
 VOLD_DECRYPT="`getprop vold.decrypt`"
 
+if test -h /data/data ; then
+    # Handle pre-CM 10.2 symlink
+    rm /data/data
+    mkdir /data/data
+    chown system.system /data/data
+    chmod 0771 /data/data
+fi
+
 if test "$CRYPTO_STATE" = "unencrypted" ; then
     if test "$VOLD_DECRYPT" = "" ; then
         # Normal unencrypted boot
-        if test -e /data/data/.nodatadata ; then
+        if test -e /datadata/.nodatadata || test -e /data/data/.nodatadata ; then
             migrate_datadata
         else
-            rmdir /data/data
-            ln -s /datadata /data/data
+            mount -o bind /datadata /data/data
 
             # Migrate download provider's cache out of /data/data because that's where market stores its downloads
             migrate_cache com.android.providers.downloads

jb_combo_v/ics_init/init.aries.gps.rc

@@ -4,17 +4,15 @@
 # conflicting with the default GPS init. (i.e. Vibrant)
 #
 
-# ST-Ericsson GNS7560
-service gpsd /system/vendor/bin/gpsd
+service gpsd /system/vendor/bin/gpsd -c /vendor/etc/gps.xml
     class late_start
+    socket gps seqpacket 0660 gps system
     user gps
     group system inet
-    oneshot
 
 on post-fs-data
-    mkdir /data/gps 775 gps system
+    # create data/gps for GPS demon
+    mkdir /data/gps 700 gps system
     chown gps system /data/gps
-    chown gps gps /sys/class/sec/gps/GPS_PWR_EN/value
-    chmod 664 /sys/class/sec/gps/GPS_PWR_EN/value
-    chown gps gps /sys/class/sec/gps/GPS_nRST/value
-    chmod 664 /sys/class/sec/gps/GPS_nRST/value
+    chown gps root /sys/class/sec/gps/GPS_PWR_EN/value
+    chmod 660 /sys/class/sec/gps/GPS_PWR_EN/value

jb_combo_v/ics_init/init.rc

@@ -21,6 +21,17 @@ on early-init
 
 # create mountpoints
     mkdir /mnt 0775 root system
+    mkdir /storage 0050 root sdcard_r
+    # Create mountpoint so Dalvik can mark as slave in zygotes.
+    mount tmpfs tmpfs /storage mode=0050,uid=0,gid=1028
+
+    # Allow system UID to setenforce and set booleans.
+    chown system system /selinux/enforce
+    chown system system /sys/fs/selinux/enforce
+    chown -R system system /selinux/booleans
+    chown -R system system /sys/fs/selinux/booleans
+    chown system system /selinux/commit_pending_bools
+    chown system system /sys/fs/selinux/commit_pending_bools
 
     # Allow system UID to setenforce and set booleans.
     chown system system /selinux/enforce
@@ -70,6 +81,7 @@ loglevel 3
 
     # See storage config details at http://source.android.com/tech/storage/
     mkdir /mnt/shell 0700 shell shell
+    # Ensure permissions are set appropriately after device early-init.
     mkdir /storage 0050 root sdcard_r
 
     # Directory for putting things only root should see.

jb_combo_v/ics_rec_init/default.prop

@@ -21,10 +21,10 @@ ro.build.type=userdebug
 ro.build.user=jenkins
 ro.build.host=cyanogenmod
 ro.build.tags=test-keys
-ro.product.model=SGH-T959
+ro.product.model=GT-I9000
 ro.product.brand=samsung
-ro.product.name=SGH-T959
-ro.product.device=SGH-T959
+ro.product.name=GT-I9000
+ro.product.device=GT-I9000
 ro.product.board=aries
 ro.product.cpu.abi=armeabi-v7a
 ro.product.cpu.abi2=armeabi
@@ -34,12 +34,12 @@ ro.product.locale.region=US
 ro.wifi.channels=
 ro.board.platform=s5pc110
 # ro.build.product is obsolete; use ro.product.device
-ro.build.product=SGH-T959
+ro.build.product=GT-I9000
 # Do not try to parse ro.build.description or .fingerprint
-ro.build.description=soju-user 2.3.5 GINGERBREAD XXJVT release-keys
-ro.build.fingerprint=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys
+ro.build.description=GT-I9000-user 2.3.5 GINGERBREAD XXJVT release-keys
+ro.build.fingerprint=samsung/GT-I9000/GT-I9000:2.3.5/GINGERBREAD/XXJVT:user/release-keys
 ro.build.characteristics=default
-ro.cm.device=vibrantmtd
+ro.cm.device=galaxysmtd
 # end build properties
 #
 # system.prop for smdkc110

jb_combo_v/ics_rec_init/init.rc

@@ -68,7 +68,6 @@ service ueventd /sbin/ueventd
     critical
 
 service recovery /sbin/recovery
-
 service setup_adbd /sbin/setup_adbd
     oneshot
 

jb_combo_v/ics_rec_init/sbin/setupdatadata.sh

@@ -9,12 +9,11 @@ PATH=/system/bin/:/system/xbin/
 
 function migrate_datadata {
     # Migrate data from /datadata to /data/data
-    if test -h /data/data ; then
-        rm /data/data
-        mkdir /data/data
-        chown system.system /data/data
-        chmod 0771 /data/data
-        cp -a /datadata/* /data/data/
+    if test -d /datadata/com.android.settings ; then
+        busybox mv -f /datadata/* /data/data/
+        # FIXME: restorecon might not restore the same context as original
+        # (remove when busybox has SELinux support)
+        restorecon -r /data/data
         touch /data/data/.nodatadata
         rm -r /data/data/lost+found
         busybox umount /datadata
@@ -27,10 +26,15 @@ function migrate_cache {
     if test -e /data/data/$1 ; then
         if ! test -h /data/data/$1/cache ; then
             OWNER="`ls -ld /data/data/$1/ | awk '{print $3}'`"
+            CONTEXT="`ls -Zd /data/data/$1/ | awk '{print $4}'`"
             rm -r /data/data2/$1 # In case it exists
             mkdir -p /data/data2/$1
             chmod 751 /data/data2/$1
+            chcon $CONTEXT /data/data2/$1
             busybox mv -f /data/data/$1/cache /data/data2/$1/
+            # FIXME: restorecon might not restore the same context as original
+            # (remove when busybox has SELinux support)
+            restorecon -r /data/data2/$1/*
             ln -s /data/data2/$1/cache /data/data/$1/cache
             chown $OWNER.$OWNER /data/data2/$1 /data/data2/$1/cache
             busybox chown -h $OWNER.$OWNER /data/data/$1/cache
@@ -47,14 +51,21 @@ function migrate_cache {
 CRYPTO_STATE="`getprop ro.crypto.state`"
 VOLD_DECRYPT="`getprop vold.decrypt`"
 
+if test -h /data/data ; then
+    # Handle pre-CM 10.2 symlink
+    rm /data/data
+    mkdir /data/data
+    chown system.system /data/data
+    chmod 0771 /data/data
+fi
+
 if test "$CRYPTO_STATE" = "unencrypted" ; then
     if test "$VOLD_DECRYPT" = "" ; then
         # Normal unencrypted boot
-        if test -e /data/data/.nodatadata ; then
+        if test -e /datadata/.nodatadata || test -e /data/data/.nodatadata ; then
             migrate_datadata
         else
-            rmdir /data/data
-            ln -s /datadata /data/data
+            mount -o bind /datadata /data/data
 
             # Migrate download provider's cache out of /data/data because that's where market stores its downloads
             migrate_cache com.android.providers.downloads