From 181792f7839cf20312bb7b6110482783cf68d10a Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Sun, 24 Feb 2019 08:28:49 +0400
Subject: [PATCH] start to split behaviour on presence of network or not

---
 bin/subiquity-configure-apt              | 3 ++-
 subiquity/controllers/installprogress.py | 8 +++++++-
 subiquity/models/subiquity.py            | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/subiquity-configure-apt b/bin/subiquity-configure-apt
index 169c86c1..49fa0fd0 100755
--- a/bin/subiquity-configure-apt
+++ b/bin/subiquity-configure-apt
@@ -15,13 +15,14 @@ setup_overlay () {
 $PY -m curtin apt-config
 
 setup_overlay $TARGET_MOUNT_POINT/etc/apt
-setup_overlay $TARGET_MOUNT_POINT/var/lib/apt/lists
 
 cat > "/tmp/sources.list" <<EOF
 deb file:///run/cdrom $(lsb_release -sc) main restricted
 EOF
 if [ $HAS_NETWORK = 'true' ]; then
     cat "$TARGET_MOUNT_POINT/etc/apt/sources.list" >> "/tmp/sources.list"
+else
+    setup_overlay $TARGET_MOUNT_POINT/var/lib/apt/lists
 fi
 mv /tmp/sources.list "$TARGET_MOUNT_POINT/etc/apt/sources.list"
 $PY -m curtin in-target -- apt-get update
diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py
index e4eccf79..86b3c4c6 100644
--- a/subiquity/controllers/installprogress.py
+++ b/subiquity/controllers/installprogress.py
@@ -298,8 +298,14 @@ class InstallProgressController(BaseController):
         else:
             cmds = [
                 ["umount", self.tpath('etc/apt')],
-                ["umount", self.tpath('var/lib/apt/lists')],
                 ]
+            if self.base_model.network.has_network:
+                cmds.append([
+                    sys.executable, "-m", "curtin", "in-target", "-t",
+                    "/target", "--", "apt-get", "update",
+                    ])
+            else:
+                cmds.append(["umount", self.tpath('var/lib/apt/lists')])
         for cmd in cmds:
             self._bg_run_command_logged(cmd)
 
diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 27f012df..85476974 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -158,7 +158,7 @@ class SubiquityModel:
             'curthooks_commands': {
                 '000-configure-apt': [
                     '/snap/bin/subiquity.subiquity-configure-apt',
-                    sys.executable, 'true',
+                    sys.executable, str(self.network.has_network).lower(),
                     ],
                 },