Commit 82aae220 authored by Thomas Goirand's avatar Thomas Goirand

* Added patches contributed by Gaudenz Steinlin <gaudenz@debian.org>

    (Closes: #784334):
    - By default the rescue and emergency shell are started on the boot
      console. This is ttyS0 on this image in order to have the boot output on
      the serial console which is accessible by "nova console-log". But there
      is no input device connected to this console, so the shells there are
      pretty useless. On the other hand tty0 is accessible via the spice or
      VNC console.
    - Only install extlinux in /boot/extlinux. Some parts were installed in
      / only, others in both locations.
    - Remove the quiet flag from the standard boot command. This is usefull on
      desktops to not clutter the boot screen, but not on a cloud image.
    - Use symlinks to kernel and initrd. This allows seamless kernel upgrades.
parent 8c39d09b
......@@ -376,22 +376,26 @@ chroot ${MOUNT_DIR} update-initramfs -u
rm ${MOUNT_DIR}/var/cache/apt/archives/*.deb
# Set console for emergency and rescue shells
SYSTEMD_DIR="${MOUNT_DIR}/etc/systemd/system/"
for service in emergency.service rescue.service ; do
mkdir "${SYSTEMD_DIR}/${service}.d"
echo '[Service]
ExecStart=
ExecStart=-/bin/sh -c "/sbin/sulogin /dev/tty0; /bin/systemctl --fail --no-block default"' > "${SYSTEMD_DIR}/${service}.d/console.conf"
done
###########################
### Setting-up extlinux ###
###########################
KERNEL=`chroot ${MOUNT_DIR} find boot -name 'vmlinuz-*'`
RAMDISK=`chroot ${MOUNT_DIR} find boot -name 'initrd.img-*'`
UUID=`blkid -o value -s UUID /dev/mapper/${LOOP_DEVICE}`
mkdir -p ${MOUNT_DIR}/boot/extlinux
echo "default linux
timeout 1
label linux
kernel ${KERNEL}
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
kernel /vmlinuz
append initrd=/initrd.img root=/dev/vda1 console=tty0 console=ttyS0,115200 ro" > ${MOUNT_DIR}/boot/extlinux/extlinux.conf
extlinux --install ${MOUNT_DIR}/boot/extlinux
###################
### HOOK SCRIPT ###
......
openstack-debian-images (1.4) UNRELEASED; urgency=medium
openstack-debian-images (1.4) unstable; urgency=medium
* Added script to build a murano image in the contrib folder.
* Now changing the version number on the output file depending on the release
name of Debian.
* Added patches contributed by Gaudenz Steinlin <gaudenz@debian.org>
(Closes: #784334):
- By default the rescue and emergency shell are started on the boot
console. This is ttyS0 on this image in order to have the boot output on
the serial console which is accessible by "nova console-log". But there
is no input device connected to this console, so the shells there are
pretty useless. On the other hand tty0 is accessible via the spice or
VNC console.
- Only install extlinux in /boot/extlinux. Some parts were installed in
/ only, others in both locations.
- Remove the quiet flag from the standard boot command. This is usefull on
desktops to not clutter the boot screen, but not on a cloud image.
- Use symlinks to kernel and initrd. This allows seamless kernel upgrades.
-- Thomas Goirand <zigo@debian.org> Wed, 06 May 2015 22:30:46 +0200
......
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