From caeca60ae1cf82dfbc0f12624c377574bf95c147 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 76cf1e8358a12..e015dabe74846 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1496,12 +1496,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 {
@@ -1548,6 +1542,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 c3417a785107ca020afaa4cfce9346273dce9a98 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 e015dabe74846..eb4ececabef94 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1496,6 +1496,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 {
@@ -1542,13 +1549,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 593ed983f8c54a6df9a4ab78541f65acb287de20 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 eb4ececabef94..7b814f6e4a01f 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1499,9 +1499,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
 }