Merge "properly handle /tmp symlink from moto gb init.rc" into ginger…

…bread
CyanogenDefy · May 16, 2012 · da24216 · da24216
2 parents d37de5b + aa92304
commit da24216
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/bootmenu/script/2nd-boot.sh b/bootmenu/script/2nd-boot.sh
@@ -17,18 +17,11 @@ killall ueventd
 ADBD_RUNNING=`ps | grep adbd | grep -v grep`
 if [ -z "$ADB_RUNNING" ]; then
     rm -f /tmp/usbd_current_state
-    #delete if is a symlink
-    [ -L "/tmp" ] && rm -f /tmp
-    mkdir -p /tmp
-else
-    # well, not beautiful but do the work
-    # to keep current usbd state (if present)
-    if [ -L "/tmp" ]; then
-        mv /tmp/usbd_current_state / 2>/dev/null
-        rm -f /tmp
-        mkdir -p /tmp
-        mv /usbd_current_state /tmp/ 2>/dev/null
-    fi
+fi
+
+# original /tmp data symlink
+if [ -L /tmp.bak ]; then
+  rm /tmp.bak
 fi
 
 if [ -L /sdcard-ext ]; then

diff --git a/bootmenu/script/2nd-init.sh b/bootmenu/script/2nd-init.sh
@@ -18,18 +18,11 @@ killall ueventd
 ADBD_RUNNING=`ps | grep adbd | grep -v grep`
 if [ -z "$ADB_RUNNING" ]; then
     rm -f /tmp/usbd_current_state
-    #delete if is a symlink
-    [ -L "/tmp" ] && rm -f /tmp
-    mkdir -p /tmp
-else
-    # well, not beautiful but do the work
-    # to keep current usbd state
-    if [ -L "/tmp" ]; then
-        mv /tmp/usbd_current_state / 2>/dev/null
-        rm -f /tmp
-        mkdir -p /tmp
-        mv /usbd_current_state /tmp/ 2>/dev/null
-    fi
+fi
+
+# original /tmp data symlink
+if [ -L /tmp.bak ]; then
+  rm /tmp.bak
 fi
 
 if [ -L /sdcard-ext ]; then

diff --git a/bootmenu/script/pre_bootmenu.sh b/bootmenu/script/pre_bootmenu.sh
@@ -80,4 +80,10 @@ if [ -x $BM_ROOTDIR/script/overclock.sh ]; then
     $BM_ROOTDIR/script/overclock.sh safe
 fi
 
+# must be restored in stock.sh
+if [ -L /tmp ]; then
+  mv /tmp /tmp.bak
+  mkdir /tmp && busybox mount -t ramfs ramfs /tmp
+fi
+
 exit 0
diff --git a/bootmenu/script/stock.sh b/bootmenu/script/stock.sh
@@ -8,10 +8,16 @@ export PATH=/sbin:/system/xbin:/system/bin
 
 ######## Main Script
 
-mount -o remount,rw /
-cp -f /system/bootmenu/binary/adbd /sbin/adbd
-chmod 4755 /sbin/adbd
-chown root.system /sbin/adbd
+busybox mount -o remount,rw /
+busybox cp -f /system/bootmenu/binary/adbd /sbin/adbd
+busybox chmod 4755 /sbin/adbd
+busybox chown root.system /sbin/adbd
+
+# restore original /tmp data symlink
+if [ -L /tmp.bak ]; then
+  busybox umount /tmp
+  busybox mv /tmp.bak /tmp
+fi
 
 ######## Cleanup