Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.562

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-02-18 16:26:07 +00:00
parent 830b298c93
commit 825e1919da
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.561) disco; urgency=medium
* Support building pi3-arm64 core18 images. At the same time, make sure we * Support building pi3-arm64 core18 images. At the same time, make sure we

3
debian/control vendored
View File

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

2
live-build/functions
View File

@ -271,7 +271,7 @@ create_vmdk() {
cp ${src} ${scratch_d}/resize.img cp ${src} ${scratch_d}/resize.img
truncate --size=${size}M ${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} modify_vmdk_header ${destination}
qemu-img info ${destination} qemu-img info ${destination}

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

@ -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 cat > "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <<EOF
[Unit] [Unit]
JobRunningTimeoutSec=0s JobRunningTimeoutSec=0s
Wants=subiquity_config.mount
EOF EOF
# Prepare installer layer. # Prepare installer layer.

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

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