Merge lp:~cyphermox/debian-cd/nomodeset into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Mathieu Trudel-Lapierre on 2019-03-12
Status: Merged
Merged at revision: 2024
Proposed branch: lp:~cyphermox/debian-cd/nomodeset
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 44 lines (+13/-5)
1 file modified
tools/boot/disco/boot-amd64 (+13/-5)
To merge this branch: bzr merge lp:~cyphermox/debian-cd/nomodeset
Reviewer Review Type Date Requested Status
Steve Langasek 2019-03-12 Needs Fixing on 2019-03-14
Review via email: mp+364344@code.launchpad.net
To post a comment you must log in.
lp:~cyphermox/debian-cd/nomodeset updated on 2019-03-14
2020. By Steve Langasek on 2019-03-13

Merge lp:~jibel/debian-cd/support_for_multilayer_images

Steve Langasek (vorlon) wrote :

Sorry, I'm inclined to nitpick a bit because I find these particular files pretty badly unmaintainable so want to limit further the further impact of this.

review: Needs Fixing
lp:~cyphermox/debian-cd/nomodeset updated on 2019-03-21
Anthony Wong (anthonywong) wrote :

Thanks for working on this stop gap solution.
I have two comments:
1. Should we omit adding this new boot entry when $PROJECT = ubuntu-server? I admit I am not familiar with server image, but results from google show they are text based and so I think server image doesn't need it.
2. I don't want to clutter up the boot menu with safe graphics options. Those who use "OEM install" option should be experienced enough to figure out what cmdline parameters they need. And I think our OEM images do not use this option.

Mathieu Trudel-Lapierre (cyphermox) wrote :

To answer questions:

ACK to not having nomodeset option for OEM -- I agree people should/would have the foreknowledge of how to handle issues if they really do need it, and this we can avoid cluttering the grub.cfg file/ menu.

For loopback; we have both because the loopback file was meant to be used for when installing straight from disk, ie. when you can blat the iso to disk, reboot using it ?!? and proceed with the install. It might well no longer be needed, it /might/ just be a remnant from wubi. I'm not sure, but I'm not willing to rip it out without knowing. That said, leads me to after all avoid adding nomodeset there, on the assumption that again, people who get to using that already know what they are doing and thus likely don't need an extra menu entry to disable modesetting.

lp:~cyphermox/debian-cd/nomodeset updated on 2019-04-04
2024. By Mathieu Trudel-Lapierre on 2019-04-04

Add a stop-gap "safe graphics mode" boot option for casper-based installs for the UEFI case (grub)

Steve Langasek (vorlon) :
lp:~cyphermox/debian-cd/nomodeset updated on 2019-04-05
2025. By Mathieu Trudel-Lapierre on 2019-04-05

Embed the space for label suffix to avoid mangling it later.

AaronMa (mapengyu) wrote :

A new menu "Try Ubuntu (safe graphics)" in daily disco image.

Verification-done-disco

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/disco/boot-amd64'
2--- tools/boot/disco/boot-amd64 2019-03-21 15:23:25 +0000
3+++ tools/boot/disco/boot-amd64 2019-04-05 21:21:38 +0000
4@@ -449,13 +449,17 @@
5 kernel $CASPER_KERNEL
6 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---
7 EOF
8+for variant in "" " (safe graphics)^ nomodeset"; do
9+ suffix="${variant%^*}"
10+ extra_kopt="${variant#*^}"
11 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
12-menuentry "${livelabel#^}" {
13+menuentry "${livelabel#^}${suffix}" {
14 set gfxpayload=keep
15- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH ---
16+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
17 initrd $CASPER_INITRD
18 }
19 EOF
20+done
21 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
22 menuentry "${livelabel#^}" {
23 set gfxpayload=keep
24@@ -470,13 +474,17 @@
25 kernel $CASPER_KERNEL
26 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---
27 EOF
28- cat >> $CDDIR/boot/grub/grub.cfg <<EOF
29-menuentry "Install $HUMANPROJECT" {
30+ for variant in "" " (safe graphics)^ nomodeset"; do
31+ suffix="${variant%^*}"
32+ extra_kopt="${variant#*^}"
33+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
34+menuentry "Install $HUMANPROJECT${suffix}" {
35 set gfxpayload=keep
36- linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH ---
37+ linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
38 initrd $CASPER_INITRD
39 }
40 EOF
41+ done
42 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
43 menuentry "Install $HUMANPROJECT" {
44 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---

Subscribers

People subscribed via source and target branches