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

Revert ubuntu-cpc: Disable boot splash

Browse Source 
These introduced a regression for ppc64el and needs more time to bake.
This reverts commits 1deb0c68e8be6b06190402e32292c3c55134eee2 &
6dbb30f53bd3f2086021abdecaee04645c9ccda0.

 * "ubuntu-cpc: Fix ppc64el grub console update"
 * "ubuntu-cpc: Disable boot splash in all cloud images (LP: #1725358)"
This commit is contained in:
Robert C Jennings 2020-08-12 16:49:17 -05:00
parent 5b32b7e373
commit 2844aa530d
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
View File

@ -35,15 +35,19 @@ install_grub() {
chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2 chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2
# set the kernel commandline to use hvc0 # set the kernel commandline to use hvc0
CONSOLES="console=hvc0 earlyprintk" mkdir -p mountpoint/etc/default/grub.d
# Append to the existing GRUB_CMDLINE_LINUX_DEFAULT line cat << EOF > mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
if [ ! -f mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg ]; then ${IMAGE_STR}
echo "Expected to find an existing grub config override"
exit 1
fi
sed -e "/^\s*GRUB_CMDLINE_LINUX_DEFAULT=/{s/=\"\"/=\"$CONSOLES$itemNum\"/;t;s/\"$/ $CONSOLES$itemNum&/;}" \
mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
# 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
prep_partition="/dev/mapper${loop_device///dev/}p2" prep_partition="/dev/mapper${loop_device///dev/}p2"
chroot mountpoint grub-install "${prep_partition}" \ chroot mountpoint grub-install "${prep_partition}" \
--no-nvram \ --no-nvram \

42
live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
View File

@ -112,27 +112,9 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
_xchroot "${rootd}" apt clean _xchroot "${rootd}" apt clean
fi fi
# for Quantal and later, use /etc/default/grub.d functionality
# rather than modifying the grub configuration itself.
# This avoids the mess of having to do dpkg stuff
# LP: 1179940
mkdir -p "${rootd}/etc/default/grub.d"
cat << EOF > "${rootd}/etc/default/grub.d/50-cloudimg-settings.cfg"
# Cloud Image specific Grub settings for Generic Cloud Images
${CLOUD_IMG_STR}
# Set the recordfail timeout
GRUB_RECORDFAIL_TIMEOUT=0
# Do not wait on grub prompt
GRUB_TIMEOUT=0
# Drop 'quiet' and 'splash' for cloud images
GRUB_CMDLINE_LINUX_DEFAULT=""
EOF
#### END COMMON ARCH FUNCTIONS #### END COMMON ARCH FUNCTIONS
case $arch in case $arch in
# ARM, ppc, riscv64 and s390x images are special # ARM, ppc, riscv64 and s390x images are special
armhf|arm64|powerpc|ppc64el|s390x|riscv64) armhf|arm64|powerpc|ppc64el|s390x|riscv64)
@ -205,15 +187,23 @@ fi
psuedo_grub_probe > "${gprobe}" psuedo_grub_probe > "${gprobe}"
chmod 755 "${gprobe}" chmod 755 "${gprobe}"
# for Quantal and later, use /etc/default/grub.d functionality
# rather than modifying the grub configuration itself.
# This avoids the mess of having to do dpkg stuff
# LP: 1179940
mkdir -p "${rootd}/etc/default/grub.d"
cat << EOF > "${rootd}/etc/default/grub.d/50-cloudimg-settings.cfg"
# Cloud Image specific Grub settings for Generic Cloud Images
${CLOUD_IMG_STR}
# Set the consoles on the default grub commandline # Set the recordfail timeout
CONSOLES="console=tty1 console=ttyS0" GRUB_RECORDFAIL_TIMEOUT=0
# Append to the existing GRUB_CMDLINE_LINUX_DEFAULT line
sed -e "/^\s*GRUB_CMDLINE_LINUX_DEFAULT=/{s/=\"\"/=\"$CONSOLES$itemNum\"/;t;s/\"$/ $CONSOLES$itemNum&/;}" \
"${rootd}/etc/default/grub.d/50-cloudimg-settings.cfg"
# Append the terminal console setting to the cloud grub config # Do not wait on grub prompt
cat << EOF >> "${rootd}/etc/default/grub.d/50-cloudimg-settings.cfg" GRUB_TIMEOUT=0
# Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
# Set the grub console type # Set the grub console type
GRUB_TERMINAL=console GRUB_TERMINAL=console