Merge lp:~humpolec-team/humpolec/UbuntuInstaller_lp1260597 into lp:humpolec

[Yuan-Chen Cheng]

remove /data/.layout_version on format system, remove /data/SWAP.img, /data/system-data and /data/user-data on format data.

build and tested.

[Rex Tsai (chihchun)]

why dont we just rm -rf "/data/SWAP.img" "/data/system-data" "/data/user-data" ?

review: Needs Information

[Yuan-Chen Cheng (ycheng-twn)]

explained in https://bugs.launchpad.net/humpolec/+bug/1260597/comments/2

review: Needs Resubmitting

[Yuan-Chen Cheng (ycheng-twn)]

fix accordingly.

review: Needs Resubmitting

[Rex Tsai (chihchun)]

looks good.

review: Approve

[lp:~humpolec-team/humpolec/UbuntuInstaller_lp1260597]

10. By Yuan-Chen Cheng on 2013-12-13

remove /data/.layout_version on format system, remove /data/SWAP.img, /data/system-data and /data/user-data on format data

=== modified file 'assets/system-image-upgrader'
--- assets/system-image-upgrader	2013-12-12 02:02:35 +0000
+++ assets/system-image-upgrader	2013-12-13 07:43:32 +0000
@@ -152,18 +152,16 @@
                 system)
                     FULL_IMAGE=1
                     rm -f /data/system.img
+                    rm -f /data/.layout_version
                     busybox dd if=/dev/zero of=/data/system.img seek=500K bs=4096 count=1
                     busybox mkfs.ext2 -F /data/system.img
                 ;;
 
-# too dangerous, so comment it out !
-#                data)
-#                    for entry in /data/*; do
-#                        if [ "$entry" != "system.img" ]; then
-#                            rm -Rf $entry
-#                        fi
-#                    done
-#                ;;
+                data)
+                    rm -f /data/SWAP.img
+                    rm -Rf /data/system-data
+                    rm -Rf /data/user-data
+                ;;
 
                 *)
                     echo "Unknown format target: $2"