debian-cd

Merge lp:~xnox/debian-cd/aarch64-laptops into lp:~ubuntu-cdimage/debian-cd/ubuntu

  1. aarch64-laptops
  2. Merge into ubuntu
Proposed by Steve Langasek
Status: Rejected
Rejected by: Steve Langasek
Proposed branch: lp:~xnox/debian-cd/aarch64-laptops
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 399 lines (+308/-9) (has conflicts)
2 files modified
tools/boot/focal/boot-arm64 (+40/-9)
tools/boot/groovy/boot-arm64 (+268/-0)
Text conflict in tools/boot/groovy/boot-arm64
To merge this branch: bzr merge lp:~xnox/debian-cd/aarch64-laptops
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+391733@code.launchpad.net

This proposal supersedes a proposal from 2020-04-26.

Commit message

Improve aarch64-laptops boot

Description of the change

Improve aarch64-laptops boot

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote : Posted in a previous version of this proposal

Dimitri, is this still applicable?

review: Needs Information
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Yes, but needs reworking. Because dtbs need to be vendored via cd-boot-images now, i guess.

Unmerged revisions

2057. By Dimitri John Ledkov

Improve aarch64-laptops boot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/boot/focal/boot-arm64'
--- tools/boot/focal/boot-arm64 2020-04-15 12:15:16 +0000
+++ tools/boot/focal/boot-arm64 2020-10-02 00:11:21 +0000
@@ -112,7 +112,7 @@
112 CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"112 CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"
113 mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"113 mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"
114 fi114 fi
115 echo -n "-J -l -c boot/boot.cat -partition_offset 16 " >> $N.mkisofs_opts115 echo -n "-J -l -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" >> $N.mkisofs_opts
116 # Once we move to xorriso >= 1.4.4, we should consider changing from116 # Once we move to xorriso >= 1.4.4, we should consider changing from
117 # "-e boot/grub/efi.img"117 # "-e boot/grub/efi.img"
118 # to118 # to
@@ -120,7 +120,7 @@
120 # This will point the el torito catalog to the appended partition instead120 # This will point the el torito catalog to the appended partition instead
121 # of the in-ISO file, which will allow us to remove efi.img from the ISO121 # of the in-ISO file, which will allow us to remove efi.img from the ISO
122 # filesystem and recover it's space.122 # filesystem and recover it's space.
123 echo -n "-append_partition 2 0xef $CDDIR/boot/grub/efi.img -e boot/grub/efi.img -no-emul-boot " >> $N.mkisofs_opts123 echo -n "-eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -isohybrid-apm-hfsplus" >> $N.mkisofs_opts
124fi124fi
125125
126#install_languages $CDDIR126#install_languages $CDDIR
@@ -148,10 +148,41 @@
148mkdir -p $CDDIR/boot148mkdir -p $CDDIR/boot
149cat cdrom/debian-cd_info.tar.gz | (cd $CDDIR/boot/; tar xz)149cat cdrom/debian-cd_info.tar.gz | (cd $CDDIR/boot/; tar xz)
150# If we want a copy of grub on the ISO as well, seems redundant:150# If we want a copy of grub on the ISO as well, seems redundant:
151#mkdir -p $CDDIR/EFI/BOOT151mkdir -p $CDDIR/EFI/BOOT
152#mcopy -i $CDDIR/boot/grub/efi.img ::EFI/BOOT/bootaa64.efi $CDDIR/EFI/BOOT/bootaa64.efi152mcopy -i $CDDIR/boot/grub/efi.img ::EFI/BOOT/bootaa64.efi $CDDIR/EFI/BOOT/bootaa64.efi
153sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg153sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
154154
155### aarch64-laptops-support
156if [ "$CDIMAGE_LIVE" = 1 ] && [ "$PROJECT" = ubuntu ]; then
157 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
158insmod smbios
159smbios --type 1 --get-string 4 --linux --set dmi_svn # DMI_SYS_VENDOR
160smbios --type 1 --get-string 5 --linux --set dmi_pn # DMI_PRODUCT_NAME
161dmi_product=svn\${dmi_svn}:pn\${dmi_pn}
162dtb=
163if [ \${dmi_product} = "svnASUSTeKCOMPUTERINC.:pnNovaGoTP370QL"]; then
164 dtb="msm8998-asus-novago-tp370ql.dtb"
165fi
166if [ \${dmi_product} = "svnLENOVO:pn81JL"]; then
167 dtb="sdm850-lenovo-yoga-c630.dtb"
168fi
169if loadfont /boot/grub/font.pf2 ; then
170 set gfxmode=auto
171 insmod efi_gop
172 insmod efi_uga
173 insmod gfxterm
174 terminal_output gfxterm
175fi
176EOF
177 cp $DI_PATH/current/legacy-images/device-tree/msm8998-asus-novago-tp370ql.dtb $CDDIR/boot/
178 cp $DI_PATH/current/legacy-images/device-tree/sdm850-lenovo-yoga-c630.dtb $CDDIR/boot/
179 LAPTOP_PARAMS=" efi=novamap clk_ignore_unused pd_ignore_unused module_blacklist=hid_sensor_hub initcall_blacklist=acpi_button_driver_init
180 if [ \"\$dtb\" ]; then
181 devicetree /boot/\$dtb
182 fi"
183fi
184### aarch64-laptops-support end
185
155# Set a timeout for grub.186# Set a timeout for grub.
156cat >> $CDDIR/boot/grub/grub.cfg <<EOF187cat >> $CDDIR/boot/grub/grub.cfg <<EOF
157set timeout=30188set timeout=30
@@ -176,14 +207,14 @@
176 cat >> $CDDIR/boot/grub/grub.cfg <<EOF207 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
177menuentry "${livelabel#^}" {208menuentry "${livelabel#^}" {
178 set gfxpayload=keep209 set gfxpayload=keep
179 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT quiet splash ---210 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT quiet splash ---${LAPTOP_PARAMS}
180 initrd $CASPER_INITRD211 initrd $CASPER_INITRD
181}212}
182EOF213EOF
183 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF214 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
184menuentry "${livelabel#^}" {215menuentry "${livelabel#^}" {
185 set gfxpayload=keep216 set gfxpayload=keep
186 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---217 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---${LAPTOP_PARAMS}
187 initrd $CASPER_INITRD218 initrd $CASPER_INITRD
188}219}
189EOF220EOF
@@ -191,13 +222,13 @@
191 cat >> $CDDIR/boot/grub/grub.cfg <<EOF222 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
192menuentry "Install $HUMANPROJECT" {223menuentry "Install $HUMANPROJECT" {
193 set gfxpayload=keep224 set gfxpayload=keep
194 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash ---225 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash ---${LAPTOP_PARAMS}
195 initrd $CASPER_INITRD226 initrd $CASPER_INITRD
196}227}
197EOF228EOF
198 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF229 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
199menuentry "Install $HUMANPROJECT" {230menuentry "Install $HUMANPROJECT" {
200 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---231 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---${LAPTOP_PARAMS}
201 initrd $CASPER_INITRD232 initrd $CASPER_INITRD
202}233}
203EOF234EOF
@@ -232,7 +263,7 @@
232 cat >> $CDDIR/boot/grub/grub.cfg <<EOF263 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
233menuentry "OEM install (for manufacturers)" {264menuentry "OEM install (for manufacturers)" {
234 set gfxpayload=keep265 set gfxpayload=keep
235 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---266 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---${LAPTOP_PARAMS}
236 initrd $CASPER_INITRD267 initrd $CASPER_INITRD
237}268}
238EOF269EOF
239270
=== modified file 'tools/boot/groovy/boot-arm64'
--- tools/boot/groovy/boot-arm64 2020-06-17 19:24:11 +0000
+++ tools/boot/groovy/boot-arm64 2020-10-02 00:11:21 +0000
@@ -15,6 +15,7 @@
1515
16> $N.mkisofs_opts16> $N.mkisofs_opts
1717
18<<<<<<< TREE
18# rename kernel+initrd19# rename kernel+initrd
19mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz20mv $CDDIR/casper/filesystem.kernel-generic $CDDIR/casper/vmlinuz
20mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd21mv $CDDIR/casper/filesystem.initrd-generic $CDDIR/casper/initrd
@@ -33,8 +34,153 @@
3334
34# generate grub.cfg35# generate grub.cfg
35mkdir -p $CDDIR/boot/grub/36mkdir -p $CDDIR/boot/grub/
37=======
38# List of boot image for each CD
39KTYPE[1]="" #isolinux multiboot in fact
40KTYPE[2]=""
41# XXX add net-image back when it's fixed
42KTYPE[3]=""
43KTYPE[4]=""
44KTYPE[5]=""
45KTYPE[6]=""
46KTYPE[7]=""
47KTYPE[8]=""
48KTYPE[9]=""
49KTYPE[10]=""
50
51THISTYPE=${KTYPE[$NN]}
52
53PREFIX_PRESEED="$(dirname "$DEFAULT_PRESEED")/"
54PREFIX_GA=""
55PREFIX_HWE=""
56KERNEL_PREFIXES="PREFIX_GA"
57if [ "$BACKPORT_KERNEL" ]; then
58 PREFIX_HWE="hwe-"
59 if [ "$PROJECT" = ubuntu-server ]; then
60 KERNEL_PREFIXES="$KERNEL_PREFIXES PREFIX_HWE"
61 fi
62fi
63
64BOOT_IMAGES=""
65TAR_IMAGES=""
66DISK_IMAGES=""
67for kp in $KERNEL_PREFIXES; do
68 BOOT_IMAGES="$BOOT_IMAGES ${!kp}cdrom/vmlinuz ${!kp}cdrom/initrd.gz ${!kp}cdrom/debian-cd_info.tar.gz"
69 TAR_IMAGES="$TAR_IMAGES ${!kp}netboot/netboot.tar.gz"
70done
71
72FLAVOUR=generic
73
74# Download boot images
75for image in MANIFEST.udebs $BOOT_IMAGES $DISK_IMAGES $TAR_IMAGES; do
76 if [ ! -e "$image" ]; then
77 dir=$(dirname $image)
78 mkdir -p $dir
79 if [ ! "$DI_WWW_HOME" ];then
80 cp "$DI_PATH/current/legacy-images/$image" "$image"
81 else
82 wget "$DI_WWW_HOME/$image" -O "$image"
83 fi
84 fi
85done
86
87if [ "$NN" = "1" ]; then
88 list_kernel_abis $BOOT_IMAGES | check_kernel_sync $FLAVOUR
89
90 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
91 for kp in $KERNEL_PREFIXES; do
92 cp -lf "${!kp}cdrom/vmlinuz" "$CDDIR/install/${!kp}vmlinuz"
93 cp -lf "${!kp}cdrom/initrd.gz" "$CDDIR/install/${!kp}initrd.gz"
94 done
95 fi
96 if [ "$CDIMAGE_LIVE" = 1 ]; then
97 if [ -e "$CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed" ]; then
98 mv $CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed $CDDIR/casper/vmlinuz.efi
99 rm -f $CDDIR/casper/filesystem.kernel-$FLAVOUR
100 CASPER_KERNEL=/casper/vmlinuz.efi
101 else
102 mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
103 CASPER_KERNEL=/casper/vmlinuz
104 fi
105 CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"
106 mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"
107 fi
108 echo -n "-J -l -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" >> $N.mkisofs_opts
109 # Once we move to xorriso >= 1.4.4, we should consider changing from
110 # "-e boot/grub/efi.img"
111 # to
112 # "-e --interval:appended_partition_2:all::"
113 # This will point the el torito catalog to the appended partition instead
114 # of the in-ISO file, which will allow us to remove efi.img from the ISO
115 # filesystem and recover it's space.
116 echo -n "-eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -isohybrid-apm-hfsplus" >> $N.mkisofs_opts
117fi
118
119#install_languages $CDDIR
120
121# Only disk one gets the extra files installed
122#
123if [ "$NN" = "1" ]; then
124
125
126# populate the install directory as well
127for disk in $DISK_IMAGES; do
128 dir=$(dirname $disk)
129 mkdir -p $CDDIR/install/$dir
130 cp -lf $disk $CDDIR/install/$dir
131done
132
133if [ "$CDIMAGE_INSTALL" = 1 ]; then
134 for tar in $TAR_IMAGES; do
135 dir=$(dirname $tar)
136 mkdir -p $CDDIR/install/$dir
137 tar -C $CDDIR/install/$dir -xzpf $tar
138 done
139fi
140
141mkdir -p $CDDIR/boot
142cat cdrom/debian-cd_info.tar.gz | (cd $CDDIR/boot/; tar xz)
143# If we want a copy of grub on the ISO as well, seems redundant:
144mkdir -p $CDDIR/EFI/BOOT
145mcopy -i $CDDIR/boot/grub/efi.img ::EFI/BOOT/bootaa64.efi $CDDIR/EFI/BOOT/bootaa64.efi
146sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
147
148### aarch64-laptops-support
149if [ "$CDIMAGE_LIVE" = 1 ] && [ "$PROJECT" = ubuntu ]; then
150 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
151insmod smbios
152smbios --type 1 --get-string 4 --linux --set dmi_svn # DMI_SYS_VENDOR
153smbios --type 1 --get-string 5 --linux --set dmi_pn # DMI_PRODUCT_NAME
154dmi_product=svn\${dmi_svn}:pn\${dmi_pn}
155dtb=
156if [ \${dmi_product} = "svnASUSTeKCOMPUTERINC.:pnNovaGoTP370QL"]; then
157 dtb="msm8998-asus-novago-tp370ql.dtb"
158fi
159if [ \${dmi_product} = "svnLENOVO:pn81JL"]; then
160 dtb="sdm850-lenovo-yoga-c630.dtb"
161fi
162if loadfont /boot/grub/font.pf2 ; then
163 set gfxmode=auto
164 insmod efi_gop
165 insmod efi_uga
166 insmod gfxterm
167 terminal_output gfxterm
168fi
169EOF
170 cp $DI_PATH/current/legacy-images/device-tree/msm8998-asus-novago-tp370ql.dtb $CDDIR/boot/
171 cp $DI_PATH/current/legacy-images/device-tree/sdm850-lenovo-yoga-c630.dtb $CDDIR/boot/
172 LAPTOP_PARAMS=" efi=novamap clk_ignore_unused pd_ignore_unused module_blacklist=hid_sensor_hub initcall_blacklist=acpi_button_driver_init
173 if [ \"\$dtb\" ]; then
174 devicetree /boot/\$dtb
175 fi"
176fi
177### aarch64-laptops-support end
178
179# Set a timeout for grub.
180>>>>>>> MERGE-SOURCE
36cat >> $CDDIR/boot/grub/grub.cfg <<EOF181cat >> $CDDIR/boot/grub/grub.cfg <<EOF
37set timeout=30182set timeout=30
183<<<<<<< TREE
38184
39loadfont unicode185loadfont unicode
40186
@@ -67,3 +213,125 @@
67 fwsetup213 fwsetup
68}214}
69EOF215EOF
216=======
217EOF
218
219if [ "$BACKPORT_KERNEL" ]; then
220 cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
221submenu 'Boot and Install with the HWE kernel' {
222EOF
223fi
224
225LAYERFS_PATH_OPT=$(add_layerfs_path_opt)
226
227if [ "$CDIMAGE_LIVE" = 1 ]; then
228 if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
229 livelabel="^Start $HUMANPROJECT"
230 liveparams=' maybe-ubiquity'
231 else
232 livelabel="^Try $HUMANPROJECT without installing"
233 liveparams=
234 fi
235 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
236menuentry "${livelabel#^}" {
237 set gfxpayload=keep
238 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT quiet splash ---${LAPTOP_PARAMS}
239 initrd $CASPER_INITRD
240}
241EOF
242 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
243menuentry "${livelabel#^}" {
244 set gfxpayload=keep
245 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} quiet splash ---${LAPTOP_PARAMS}
246 initrd $CASPER_INITRD
247}
248EOF
249 if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ]; then
250 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
251menuentry "Install $HUMANPROJECT" {
252 set gfxpayload=keep
253 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash ---${LAPTOP_PARAMS}
254 initrd $CASPER_INITRD
255}
256EOF
257 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
258menuentry "Install $HUMANPROJECT" {
259 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---${LAPTOP_PARAMS}
260 initrd $CASPER_INITRD
261}
262EOF
263 fi
264fi
265if [ "$CDIMAGE_INSTALL" = 1 ]; then
266 if [ "$CDIMAGE_LIVE" != 1 ]; then
267 for kp in $KERNEL_PREFIXES; do
268 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
269menuentry "Install $HUMANPROJECT" {
270 set gfxpayload=keep
271 linux /install/${!kp}vmlinuz $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} quiet ---
272 initrd /install/${!kp}initrd.gz
273}
274EOF
275 done
276 else
277 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
278menuentry "Install $HUMANPROJECT in text mode" {
279 set gfxpayload=keep
280 linux /install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
281 initrd /install/initrd.gz
282}
283EOF
284 fi
285fi
286# The GRUB versions of this only correspond to single isolinux labels,
287# because we don't yet have the necessary technology in our GRUB menu stack
288# to have a two-dimensional set of boot options, as is implemented for
289# isolinux using the gfxboot "applies" keyword.
290if [ "$CDIMAGE_LIVE" = 1 ]; then
291 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
292menuentry "OEM install (for manufacturers)" {
293 set gfxpayload=keep
294 linux $CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---${LAPTOP_PARAMS}
295 initrd $CASPER_INITRD
296}
297EOF
298else
299 for kp in $KERNEL_PREFIXES; do
300 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
301menuentry "OEM install (for manufacturers)" {
302 set gfxpayload=keep
303 linux /install/${!kp}vmlinuz $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}} quiet oem-config/enable=true ---
304 initrd /install/${!kp}initrd.gz
305}
306EOF
307 done
308fi
309if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
310 for kp in $KERNEL_PREFIXES; do
311 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
312menuentry "Check disc for defects" {
313 set gfxpayload=keep
314 linux /install/${!kp}vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
315 initrd /install/${!kp}initrd.gz
316}
317EOF
318 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
319menuentry "Rescue a broken system" {
320 set gfxpayload=keep
321 linux /install/${!kp}vmlinuz $KERNEL_PARAMS rescue/enable=true ---
322 initrd /install/${!kp}initrd.gz
323}
324EOF
325 done
326fi
327if [ "$BACKPORT_KERNEL" ] && [ "$PROJECT" = ubuntu-server ]; then
328 cat >> $CDDIR/boot/grub/hwe-grub.cfg <<EOF
329}
330EOF
331 cat $CDDIR/boot/grub/hwe-grub.cfg >> $CDDIR/boot/grub/grub.cfg
332fi
333rm -f $CDDIR/boot/grub/hwe-grub.cfg
334fi
335
336# th,th, thats all
337>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches