Imported 2.562

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.562) disco; urgency=medium
+
+  * subiquity: make subiqutiy_config.mount optional
+  * Add python3 vmdkstream support
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 18 Feb 2019 12:01:51 +0100
+
 livecd-rootfs (2.561) disco; urgency=medium
 
   * Support building pi3-arm64 core18 images. At the same time, make sure we

debian/control

@@ -28,6 +28,7 @@ Depends: ${misc:Depends},
          parted,
          procps,
          python-minimal | python,
+         python3-minimal | python3,
          python3-apt,
          python3-software-properties,
          qemu-utils,
@@ -37,7 +38,7 @@ Depends: ${misc:Depends},
          sudo,
          u-boot-tools [armhf arm64],
          ubuntu-image,
-         vmdk-stream-converter [amd64 i386],
+         python3-vmdkstream [amd64 i386] | vmdk-stream-converter [amd64 i386],
          xz-utils,
          zerofree
 Breaks: ubuntu-defaults-builder (<< 0.32)

live-build/functions

@@ -271,7 +271,7 @@ create_vmdk() {
     cp ${src} ${scratch_d}/resize.img
 
     truncate --size=${size}M ${scratch_d}/resize.img
-    python -m ${streamconverter} ${scratch_d}/resize.img ${destination}
+    python3 -m ${streamconverter} ${scratch_d}/resize.img ${destination} || python2 -m ${streamconverter} ${scratch_d}/resize.img ${destination}
     modify_vmdk_header ${destination}
 
     qemu-img info ${destination}

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -45,6 +45,7 @@ mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d"
 cat > "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <<EOF
 [Unit]
 JobRunningTimeoutSec=0s
+Wants=subiquity_config.mount
 EOF
 
 # Prepare installer layer.

live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount

@@ -1 +0,0 @@
-../subiquity_config.mount