debian-cd

Merge lp:~xnox/debian-cd/drop-integrity-check-menu-entry into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. drop-integrity-check-menu-entry
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Iain Lane
Approved revision: 2048
Merged at revision: 2051
Proposed branch: lp:~xnox/debian-cd/drop-integrity-check-menu-entry
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 59 lines (+2/-36)
2 files modified
tools/boot/focal/boot-amd64 (+1/-21)
tools/boot/focal/boot-arm64 (+1/-15)
To merge this branch: bzr merge lp:~xnox/debian-cd/drop-integrity-check-menu-entry
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+381966@code.launchpad.net

Commit message

focal: drop casper integrity-check menu-entry, it is now performed on every boot

Description of the change

focal: drop casper integrity-check menu-entry, it is now performed on every boot

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

https://launchpad.net/ubuntu/+source/casper/1.440 and up do integrity check by default, later uploads fixed integration with different plymouth themes.

Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/focal/boot-amd64'
2--- tools/boot/focal/boot-amd64 2020-04-01 10:28:48 +0000
3+++ tools/boot/focal/boot-amd64 2020-04-08 22:37:25 +0000
4@@ -644,27 +644,7 @@
5 applies ltsp=install
6 EOF
7 fi
8-if [ "$CDIMAGE_LIVE" = 1 ]; then
9- cat >> boot$N/isolinux/txt.cfg <<EOF
10-label check
11- menu label ^Check disc for defects
12- kernel $CASPER_KERNEL
13- append $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check initrd=$CASPER_INITRD quiet splash ---
14-EOF
15- cat >> $CDDIR/boot/grub/grub.cfg <<EOF
16-menuentry "Check disc for defects" {
17- set gfxpayload=keep
18- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
19- initrd $CASPER_INITRD\$casper_flavour
20-}
21-EOF
22- cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
23-menuentry "Check disc for defects" {
24- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
25- initrd $CASPER_INITRD\$casper_flavour
26-}
27-EOF
28-elif [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
29+if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
30 cat >> boot$N/isolinux/txt.cfg <<EOF
31 label check
32 menu label ^Check disc for defects
33
34=== modified file 'tools/boot/focal/boot-arm64'
35--- tools/boot/focal/boot-arm64 2020-02-18 17:37:38 +0000
36+++ tools/boot/focal/boot-arm64 2020-04-08 22:37:25 +0000
37@@ -247,21 +247,7 @@
38 EOF
39 done
40 fi
41-if [ "$CDIMAGE_LIVE" = 1 ]; then
42- cat >> $CDDIR/boot/grub/grub.cfg <<EOF
43-menuentry "Check disc for defects" {
44- set gfxpayload=keep
45- linux $CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
46- initrd $CASPER_INITRD
47-}
48-EOF
49- cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
50-menuentry "Check disc for defects" {
51- linux $CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
52- initrd $CASPER_INITRD
53-}
54-EOF
55-elif [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
56+if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
57 for kp in $KERNEL_PREFIXES; do
58 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
59 menuentry "Check disc for defects" {

Subscribers

People subscribed via source and target branches