diff --git a/debian/changelog b/debian/changelog index 4db6be9a..88a339ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.449) artful; urgency=medium + + [ Balint Reczey ] + * Use VMDKstream in a more future-proof way + + [ Dimitri John Ledkov ] + * Drop creating upstart jobs for serial getty. + + -- Dimitri John Ledkov Mon, 14 Aug 2017 17:02:53 +0100 + livecd-rootfs (2.448) artful; urgency=medium [ Balint Reczey ] diff --git a/live-build/functions b/live-build/functions index 028352ac..fee44f67 100644 --- a/live-build/functions +++ b/live-build/functions @@ -226,12 +226,12 @@ create_vmdk() { destination="$2" size="${3:-10240}" - streamconverter="/usr/lib/python2.7/dist-packages/VMDKstream.py" + streamconverter="VMDKstream" scratch_d=$(mktemp -d) cp ${src} ${scratch_d}/resize.img truncate --size=${size}M ${scratch_d}/resize.img - python ${streamconverter} ${scratch_d}/resize.img ${destination} + python -m ${streamconverter} ${scratch_d}/resize.img ${destination} modify_vmdk_header ${destination} qemu-img info ${destination} diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index cf6b6bdb..fe11fd5e 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -20,36 +20,6 @@ _xchroot() { #### COMMON architecture independent functions arch=$(_xchroot "${rootd}" dpkg --print-architecture) -add_serial_console() { - condev=$1 - idir="$rootd/etc/init" - cat << EOF > "${idir}/${condev}.conf" -# CONDEV - getty -# -# This service maintains a getty on CONDEV from the point the system is -# started until it is shut down again. - -start on stopped rc RUNLEVEL=[2345] and ( - not-container or - container CONTAINER=lxc or - container CONTAINER=lxc-libvirt) - -stop on runlevel [!2345] - -pre-start script - # getty will not be started if the serial console is not present - stty -F /dev/CONDEV -a 2> /dev/null > /dev/null || { stop ; exit 0; } -end script - -respawn -script - exec /sbin/getty -L CONDEV 115200 vt102 -end script -${CLOUD_IMG_STR} -EOF - sed -i "s/CONDEV/${condev}/g" "$idir/${condev}.conf" -} - fake_cloud_init() { # If the cloud does not provide a meta-data service this should be run # This will setup a nocloud datasource. @@ -157,8 +127,6 @@ fi case $arch in # ARM images are special armhf|arm64) - echo "Configuring ARM Serial Port" - add_serial_console ttyAMA0 # Dirty hack because SUBARCH doesn't exist when running chroot hooks, # and we don't want raspi2 images to depend on a cloud data source: if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then @@ -169,15 +137,7 @@ case $arch in exit 0 ;; - ## Add ttyS0 for i386/amd64 for Trusty and newer - i386|amd64) - add_serial_console ttyS0 - ;; - powerpc|ppc64el) - add_serial_console hvc0 - exit 0 - ;; - s390x) + powerpc|ppc64el|s390x) exit 0 ;; esac