Fix to reboot in case of verityctl failure

Change-Id: I1d4135b8fefa536a9659f7d0d5a8d55475e9b208
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/scripts/fota-init.sh b/scripts/fota-init.sh
index 8312f19e9caae56e29c0be297b0fc0576c11e51f..f2eddadd5e6b18a76e1f17ebdf9ee37f818e38c6 100755 (executable)
--- a/scripts/fota-init.sh
+++ b/scripts/fota-init.sh
@@ -63,6 +63,20 @@ log() {
        echo "$LOG"
 }
 
+#------------------------------------------------
+#      do_reboot
+#------------------------------------------------
+do_reboot() {
+       log "Reboot"
+       "$SYNC"
+       "$REBOOT"
+       while true
+       do
+               sleep 1
+               echo "."
+       done
+}
+
 #------------------------------------------------
 #       get partition id
 #------------------------------------------------
@@ -205,7 +219,8 @@ mount_rootfs()
                 ;;
             2)
                 echo "verifyboot: enabled but corrupted"
-                # should deal with the error like reboot.
+                # reboot
+               do_reboot
                 ;;
             3)
                 echo "verifyboot: disabling"
@@ -449,20 +464,6 @@ init_fota_dir() {
        done
 }
 
-#------------------------------------------------
-#      do_reboot
-#------------------------------------------------
-do_reboot() {
-       log "Reboot"
-       "$SYNC"
-       "$REBOOT"
-       while true
-       do
-               sleep 1
-               echo "."
-       done
-}
-
 #------------------------------------------------
 #      check_for_rw_power_fail
 #------------------------------------------------

diff --git a/scripts/fus_rw-init.sh b/scripts/fus_rw-init.sh
index 4699abea93585396539356c55cd478cbefa1f8f2..835a0cc1ab186fd9cdceaa9da892f7d62f5ab69c 100755 (executable)
--- a/scripts/fus_rw-init.sh
+++ b/scripts/fus_rw-init.sh
@@ -17,6 +17,20 @@ MOUNT="/bin/mount"
 GREP="/bin/grep"
 BLKID="/usr/sbin/blkid"
 
+#------------------------------------------------
+#      do_reboot
+#------------------------------------------------
+do_reboot() {
+       echo "Reboot"
+       "$SYNC"
+       "$REBOOT"
+       while [ 1 ]
+       do
+               sleep 1
+               echo "."
+       done
+}
+
 #------------------------------------------------
 #       get partition id
 #------------------------------------------------
@@ -73,7 +87,8 @@ mount_rootfs()
                 ;;
             2)
                 echo "verifyboot: enabled but corrupted"
-                # should deal with the error like reboot.
+                # reboot
+               do_reboot
                 ;;
             3)
                 echo "verifyboot: disabling"
@@ -110,20 +125,6 @@ mount_partitions() {
     "$MOUNT" -t tmpfs tmpfs ${FAKE_ROOT}/tmp
 }
 
-#------------------------------------------------
-#      do_reboot
-#------------------------------------------------
-do_reboot() {
-       echo "Reboot"
-       "$SYNC"
-       "$REBOOT"
-       while [ 1 ]
-       do
-               sleep 1
-               echo "."
-       done
-}
-
 #------------------------------------------------
 #      do_rw_update
 #------------------------------------------------