Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-03 18:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.373 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 63154a9a2f35d29fb66f3b90ba72d76df4d14503

New changelog entries:
  * Set timeout options so ppc64el cloud images don't display a grub boot
    menu (matching the behaviour of other cloud images).
  * Specify a regex to run-parts so that cloud image extra scripts are found
    and executed.
This commit is contained in:
Daniel Watkins 2016-01-28 11:51:23 +00:00 committed by usd-importer
parent 63154a9a2f
commit b668a9f9f9
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.373) xenial; urgency=medium
* Set timeout options so ppc64el cloud images don't display a grub boot
menu (matching the behaviour of other cloud images).
* Specify a regex to run-parts so that cloud image extra scripts are found
and executed.
-- Daniel Watkins <daniel.watkins@canonical.com> Thu, 28 Jan 2016 11:51:23 +0000
livecd-rootfs (2.372) xenial; urgency=medium
* Install grub in ppc64el cloud images so they are bootable (LP: #1538610)

8
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
View File

@ -30,7 +30,13 @@ install_grub() {
mkdir -p mountpoint/etc/default/grub.d
cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
${CLOUD_IMG_STR}
#
# Set the recordfail timeout
GRUB_RECORDFAIL_TIMEOUT=0
# Do not wait on grub prompt
GRUB_TIMEOUT=0
# Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
EOF

2
live-build/ubuntu-cpc/hooks/999-extras.binary
View File

@ -12,4 +12,4 @@ fi
. /build/config/functions
# Cleaner execution
/bin/run-parts ${extra_d}
/bin/run-parts --regex ".*\.binary" "${extra_d}"