Merge lp:~jamesodhunt/ubuntu-cdimage/ubuntu-core-no-livefs-download into lp:ubuntu-cdimage

[James Hunt]

This change allows an image build initiated as follows to complete successfully:

$ UBUNTU_FORCE_LOCAL=1 DEBUG=1 SUBPROJECT=system-image for-project ubuntu-core cron.daily-preinstalled --live

Although this is a pragmatic fix, I'm not 100% convinced this is the safest one since we appear to be overloading the term 'ubuntu-core' in various places. This is in fact what led to the bug this MP fixes I believe so maybe we need a totally separate name for the "new" ubuntu-core image to minimise confusion?

[Colin Watson (cjwatson)]

This looks very wrong, I'm afraid; build_livecd_base is a critical part of the build for this image type, and a preinstalled image must fetch the image from somewhere. To support local building, you should instead modify download_live_filesystems to "download" from the local system.

Do you still need to pursue the UBUNTU_FORCE_LOCAL=1 path now that we have builds up and running in Launchpad? It was only ever a short-term approach to get you bootstrapped. While I'd like to have a nicely assembled local build path in cdimage, you shouldn't allow it to be a distraction from the goal of getting this image working.

review: Disapprove

Unmerged revisions

1445. By James Hunt on 2014-07-29

* Don't download live filesystem for ubuntu-core daily-preinstalled
  image.

=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py	2014-07-29 08:47:34 +0000
+++ lib/cdimage/build.py	2014-07-29 22:07:24 +0000
@@ -663,7 +663,8 @@
         if config["UBUNTU_DEFAULTS_LOCALE"]:
             build_ubuntu_defaults_locale(config)
         elif live_fs_only:
-            build_livecd_base(config)
+            if config.image_type != "daily-preinstalled":
+                build_livecd_base(config)
         else:
             if not config["CDIMAGE_PREINSTALLED"]:
                 log_marker("Germinating")