Revert "Do RW Update if the .do_rw_update flag is set"

This reverts commit 5fd2c264562205b64b1888f9708ce3ed8235f29d.

Change-Id: I40403a66d54aa593315480f982735bf08ccd9cb3

diff --git a/scripts/init.sh b/scripts/init.sh
index 7c52b34efe26b40c444f85b82f309107be2e97de..660dfb43525a499551ea912bf2b4c4f3c0735c60 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -15,7 +15,6 @@ MODULES_MNT=
 IN_INITRD=0
 NEED_RESIZEFS=1
 USERFS_ENCRYPTED=0
-DO_RW_UPDATE=0
 
 function find_partitions()
 {
@@ -100,17 +99,6 @@ function check_flags()
             NEED_RESIZEFS=0
         fi
 
-        BOOTMODE=$([[ $(</proc/cmdline) =~ bootmode=([a-z]+) ]]; echo ${BASH_REMATCH[1]})
-        if [ "${BOOTMODE}" == "fota" ]
-        then
-            if [ -e /opt/.do_rw_update ]
-            then
-                DO_RW_UPDATE=1
-            else
-                echo "WARNING : No .do_rw_update file. A normal boot will be performed."
-            fi
-        fi
-
         /bin/umount /opt
     fi
 }
@@ -216,13 +204,7 @@ function process_datafs()
         /sbin/resize2fs -f $DATAFS
     fi
     /sbin/fsck -y $DATAFS
-
-    # In case of  RW Update we want to mount /opt as dm-bow device by
-    # data-checkpoint.service.
-    # During normal boot this partition should be mounted there
-    if [ "$DO_RW_UPDATE" = "0" ]; then
-        /bin/mount $DATAFS $DATAFS_MNT
-    fi
+    /bin/mount $DATAFS $DATAFS_MNT
 }
 
 
@@ -337,16 +319,11 @@ function change_root()
 {
     if [ $$ = 1 ]
     then
-        if [ "$DO_RW_UPDATE" = "1" ]
+        if [ "$IN_INITRD" = "1" ]
         then
-            exec chroot . /usr/lib/systemd/systemd "--unit=system-update.target" "$@"
+            exec chroot . /sbin/init $@
         else
-            if [ "$IN_INITRD" = "1" ]
-            then
-                exec chroot . /sbin/init $@
-            else
-                exec /usr/lib/systemd/systemd $@
-            fi
+            exec /usr/lib/systemd/systemd $@
         fi
     fi
 }