Merge lp:~mwhudson/debian-cd/live-server-cmdline into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Michael Hudson-Doyle on 2018-01-15
Status: Rejected
Rejected by: Adam Conrad on 2018-01-16
Proposed branch: lp:~mwhudson/debian-cd/live-server-cmdline
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 107 lines (+41/-18)
1 file modified
tools/boot/bionic/boot-amd64 (+41/-18)
To merge this branch: bzr merge lp:~mwhudson/debian-cd/live-server-cmdline
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team 2018-01-15 Pending
Review via email: mp+336091@code.launchpad.net

Description of the change

I didn't try to make these changes minimal, I just broke live-server out into its own section. I don't know if the configs apart from $CDDIR/boot/grub/grub.cfg make any sense in this context.

To post a comment you must log in.
Michael Hudson-Doyle (mwhudson) wrote :

In case it's not obvious, I have no idea at all how to test these changes :/

Michael Hudson-Doyle (mwhudson) wrote :

Ah of course you can test this at least somewhat by editing the command line interactively, which I did and found that it's boot=overlay not boot=overlayfs...

1986. By Michael Hudson-Doyle on 2018-01-15

union=overlay, not overlayfs

Adam Conrad (adconrad) wrote :

Rejected, per IRC discussion.

Unmerged revisions

1986. By Michael Hudson-Doyle on 2018-01-15

union=overlay, not overlayfs

1985. By Michael Hudson-Doyle on 2018-01-15

come on, it's 2018, let's use overlayfs

1984. By Michael Hudson-Doyle on 2018-01-15

tweak live-server command lines

 * remove 'quiet splash'
 * add console=ttyS0 console=tty1 so there is some life on a reasonably sane
   default for a serial console.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/bionic/boot-amd64'
2--- tools/boot/bionic/boot-amd64 2017-11-29 19:40:53 +0000
3+++ tools/boot/bionic/boot-amd64 2018-01-15 10:12:27 +0000
4@@ -417,62 +417,85 @@
5 append normal=
6 EOF
7 if [ "$CDIMAGE_LIVE" = 1 ]; then
8- if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
9- livelabel="^Start $HUMANPROJECT"
10- liveparams=' maybe-ubiquity'
11- elif [ "$PROJECT" = ubuntu-server ]; then
12- livelabel="^Install $HUMANPROJECT"
13- liveparams=' union=aufs'
14+ if [ "$PROJECT" = ubuntu-server ]; then
15+ livelabel="^Install $HUMANPROJECT"
16+ liveopts='boot=casper union=overlay'
17+ systemdopts='console=ttyS0 console=tty1'
18+ cat >> boot$N/isolinux/txt.cfg <<EOF
19+label live
20+ menu label $livelabel
21+ kernel $CASPER_KERNEL
22+ append $KERNEL_PARAMS $liveopts initrd=$CASPER_INITRD --- $systemdopts
23+EOF
24+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
25+menuentry "${livelabel#^}" {
26+ set gfxpayload=keep
27+ linux $CASPER_KERNEL $KERNEL_PARAMS $liveopts --- $systemdopts
28+ initrd $CASPER_INITRD
29+}
30+EOF
31+ cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
32+menuentry "${livelabel#^}" {
33+ set gfxpayload=keep
34+ linux $CASPER_KERNEL $KERNEL_PARAMS $liveopts iso-scan/filename=\${iso_path} --- $systemdopts
35+ initrd $CASPER_INITRD
36+}
37+EOF
38 else
39- livelabel="^Try $HUMANPROJECT without installing"
40- liveparams=
41- fi
42- cat >> boot$N/isolinux/txt.cfg <<EOF
43+ if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
44+ livelabel="^Start $HUMANPROJECT"
45+ liveparams=' maybe-ubiquity'
46+ else
47+ livelabel="^Try $HUMANPROJECT without installing"
48+ liveparams=
49+ fi
50+ cat >> boot$N/isolinux/txt.cfg <<EOF
51 label live
52 menu label $livelabel
53 kernel $CASPER_KERNEL
54 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
55 EOF
56- cat >> $CDDIR/boot/grub/grub.cfg <<EOF
57+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
58 menuentry "${livelabel#^}" {
59 set gfxpayload=keep
60 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash ---
61 initrd $CASPER_INITRD
62 }
63 EOF
64- cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
65+ cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
66 menuentry "${livelabel#^}" {
67 set gfxpayload=keep
68 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
69 initrd $CASPER_INITRD
70 }
71 EOF
72- if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
73- cat >> boot$N/isolinux/txt.cfg <<EOF
74+ if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
75+ cat >> boot$N/isolinux/txt.cfg <<EOF
76 label live-install
77 menu label ^Install $HUMANPROJECT
78 kernel $CASPER_KERNEL
79 append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
80 EOF
81- cat >> $CDDIR/boot/grub/grub.cfg <<EOF
82+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
83 menuentry "Install $HUMANPROJECT" {
84 set gfxpayload=keep
85 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash ---
86 initrd $CASPER_INITRD
87 }
88 EOF
89- cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
90+ cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
91 menuentry "Install $HUMANPROJECT" {
92 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
93 initrd $CASPER_INITRD
94 }
95 EOF
96- fi
97- cat >> boot$N/isolinux/gfxboot.cfg <<EOF
98+ fi
99+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
100 label driverupdates=Use driver update disc
101 append driverupdates=debian-installer/driver-update=true
102 applies driverupdates=live live-install
103 EOF
104+ fi
105 fi
106 if [ "$CDIMAGE_INSTALL" = 1 ]; then
107 if [ "$CDIMAGE_LIVE" != 1 ]; then

Subscribers

People subscribed via source and target branches