Commit a4986b33 authored by Thomas Goirand's avatar Thomas Goirand

* Using -O compat=0.10 when qemu-img is greater than 1.0.

  * Using "console=tty0 console=ttyS0,115200" as boot parameter. The issue to
    not being able to log into multiple console is in bootlogd (see Debian bug
    181756).
parent 899b1946
......@@ -357,8 +357,8 @@ echo "default linux
timeout 1
label linux
kernel ${KERNEL}
append initrd=${RAMDISK} root=/dev/vda1 ro quiet console=ttyS0" > ${MOUNT_DIR}/boot/extlinux/extlinux.conf
#append initrd=${RAMDISK} root=/dev/vda1 console=tty0 console=ttyS0,115200 ro quiet" > ${MOUNT_DIR}/boot/extlinux/extlinux.conf
append initrd=${RAMDISK} root=/dev/vda1 console=tty0 console=ttyS0,115200 ro quiet" > ${MOUNT_DIR}/boot/extlinux/extlinux.conf
#append initrd=${RAMDISK} root=/dev/vda1 ro quiet console=ttyS0" > ${MOUNT_DIR}/boot/extlinux/extlinux.conf
cp ${MOUNT_DIR}/boot/extlinux/extlinux.conf ${MOUNT_DIR}/extlinux.conf
extlinux --install ${MOUNT_DIR}
#chroot ${MOUNT_DIR} extlinux-update
......@@ -411,4 +411,11 @@ if [ "${AUTOMATIC_RESIZE}" = "yes" ] ; then
install-mbr ${AMI_NAME}
fi
qemu-img convert -c -f raw ${AMI_NAME} -O qcow2 ${QCOW2_NAME}
QEMU_VERSION=`qemu-img --help | head -n 1 | cut -d" " -f3 | cut -d"," -f1`
if dpkg --compare-versions ${QEMU_VERSION} gt 1.0 ; then
OTHER_QEMU_IMG_OPTIONS=" -O compat=0.10"
else
OTHER_QEMU_IMG_OPTIONS=""
fi
qemu-img convert -c -f raw ${AMI_NAME}${OTHER_QEMU_IMG_OPTIONS} -O qcow2 ${QCOW2_NAME}
openstack-debian-images (0.11) unstable; urgency=medium
* Using -O compat=0.10 when qemu-img is greater than 1.0.
* Using "console=tty0 console=ttyS0,115200" as boot parameter. The issue to
not being able to log into multiple console is in bootlogd (see Debian bug
181756).
-- Thomas Goirand <zigo@debian.org> Sun, 20 Jul 2014 13:30:18 +0800
openstack-debian-images (0.10) unstable; urgency=medium
* Added an option to choose the login username, thanks to Jordan Pittier
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment