From 0376c58c44d71e23494b8ea586578208d5a11c18 Mon Sep 17 00:00:00 2001
From: vteratipally <67723486+vteratipally@users.noreply.github.com>
Date: Wed, 4 Aug 2021 12:09:10 -0700
Subject: [PATCH 1/3] Update configure-helper.sh

add live-restore true by default.
---
 cluster/gce/gci/configure-helper.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 11629bd6ed7..c934e23a25e 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1506,12 +1506,6 @@ function set_docker_options_non_ubuntu() {
 
    addockeropt "\"mtu\": 1460,"
    addockeropt "\"storage-driver\": \"overlay2\","
-
-   echo "setting live restore"
-   # Disable live-restore if the environment variable is set.
-   if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
-      addockeropt "\"live-restore\": \"false\","
-   fi
 }
 
 function assemble-docker-flags {
@@ -1558,6 +1552,14 @@ addockeropt "\"pidfile\": \"/var/run/docker.pid\",
   disable_aufs
   set_docker_options_non_ubuntu
 
+  echo "setting live restore"
+   # Disable live-restore if the environment variable is set.
+   if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
+      addockeropt "\"live-restore\": \"false\","
+   else
+      addockeropt "\"live-restore\": \"true\","
+   fi
+
   echo "setting docker logging options"
   # Configure docker logging
   addockeropt "\"log-driver\": \"${DOCKER_LOG_DRIVER:-json-file}\","

From b0039559ddfa0be0c42325332fb3927c8ba48dcb Mon Sep 17 00:00:00 2001
From: vteratipally <67723486+vteratipally@users.noreply.github.com>
Date: Wed, 4 Aug 2021 13:19:00 -0700
Subject: [PATCH 2/3] Update configure-helper.sh

---
 cluster/gce/gci/configure-helper.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index c934e23a25e..94c7286103c 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1506,6 +1506,13 @@ function set_docker_options_non_ubuntu() {
 
    addockeropt "\"mtu\": 1460,"
    addockeropt "\"storage-driver\": \"overlay2\","
+   echo "setting live restore"
+   # Disable live-restore if the environment variable is set.
+   if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
+      addockeropt "\"live-restore\": \"false\","
+   else
+      addockeropt "\"live-restore\": \"true\","
+   fi
 }
 
 function assemble-docker-flags {
@@ -1552,13 +1559,6 @@ addockeropt "\"pidfile\": \"/var/run/docker.pid\",
   disable_aufs
   set_docker_options_non_ubuntu
 
-  echo "setting live restore"
-   # Disable live-restore if the environment variable is set.
-   if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
-      addockeropt "\"live-restore\": \"false\","
-   else
-      addockeropt "\"live-restore\": \"true\","
-   fi
 
   echo "setting docker logging options"
   # Configure docker logging

From 5d84ffa6c26cb00a69a1d3091a271966994e8e7f Mon Sep 17 00:00:00 2001
From: vteratipally <67723486+vteratipally@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:36:16 -0700
Subject: [PATCH 3/3] Update configure-helper.sh

---
 cluster/gce/gci/configure-helper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 94c7286103c..f278d6a3893 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1509,9 +1509,9 @@ function set_docker_options_non_ubuntu() {
    echo "setting live restore"
    # Disable live-restore if the environment variable is set.
    if [[ "${DISABLE_DOCKER_LIVE_RESTORE:-false}" == "true" ]]; then
-      addockeropt "\"live-restore\": \"false\","
+      addockeropt "\"live-restore\": false,"
    else
-      addockeropt "\"live-restore\": \"true\","
+      addockeropt "\"live-restore\": true,"
    fi
 }