Merge ~mwhudson/ubuntu/+source/partman-efi:lp-1847721 into ubuntu/+source/partman-efi:ubuntu/devel

Proposed by Michael Hudson-Doyle
Status: Needs review
Proposed branch: ~mwhudson/ubuntu/+source/partman-efi:lp-1847721
Merge into: ubuntu/+source/partman-efi:ubuntu/devel
Diff against target: 26 lines (+0/-4)
2 files modified
update.d/efi_sync_flag (+0/-2)
update.d/efi_visuals (+0/-2)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) uploaded alternative Disapprove
Ubuntu Server Dev import team Pending
Review via email: mp+384067@code.launchpad.net

Commit message

always run efi_sync_flag and efi_visuals

These two commands were not run when not booted under UEFI, but we want
to support setting up an ESP even when booted in legacy mode.

The commands only touch partitions with the "efi" method so this
shouldn't do anything bad.

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

I'd go one step further and drop the check in commit.d too.

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

erm... actually not sure what i meant by the above comment.

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

Ok, i mean, if we now want to always setup esp, we should change init.d/efi script to always touch /var/lib/partman/efi

Not just when in_efi_mode()

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

So, I think instead we should do this https://launchpadlibrarian.net/481499180/partman-efi-lp1847721.diff

Which will then make all the other .d/* things work correctly.

Revision history for this message
Dimitri John Ledkov (xnox) :
review: Disapprove (uploaded alternative)
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

init.d does some other stuff that basically sets method=efi on things that "look like" ESPs. That seems faintly risky to me but I guess it doesn't hurt us when we EFI boot so eh.

It would be simpler code to remove the creation and all checks for /var/lib/partman/efi but also eh.

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

On Tue, 26 May 2020, 22:46 Michael Hudson-Doyle, <email address hidden>
wrote:

> init.d does some other stuff that basically sets method=efi on things that
> "look like" ESPs. That seems faintly risky to me but I guess it doesn't
> hurt us when we EFI boot so eh.
>
> It would be simpler code to remove the creation and all checks for
> /var/lib/partman/efi but also eh.
>

True

>

Unmerged commits

41e51d0... by Michael Hudson-Doyle

always run efi_sync_flag and efi_visuals

These two commands were not run when not booted under UEFI, but we want
to support setting up an ESP even when booted in legacy mode.

The commands only touch partitions with the "efi" method so this
shouldn't do anything bad.

687a9ec... by Mathieu Trudel-Lapierre

Import patches-unapplied version 71ubuntu5 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: 93876c9ea32980e3f61cc36f20fc3e417da34f3a

New changelog entries:
  * check.d/efi: Make sure we block on a missing EFI partition no matter what
    architecture, not just for ia64. One could attempt to install on EFI x86
    and will need an ESP to be able to install GRUB. (LP: #1803031)
  * debian/partman-efi.templates: Make the no_efi template clearer, so that it
    clearly explains why an EFI System partition is important.

93876c9... by Łukasz Zemczak

Import patches-unapplied version 71ubuntu4 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 85b8f7d8dbdf398862b0fd4f74d087ff4b333b4f

New changelog entries:
  * Clean-up leftover checks for the no longer used ignore_uefi file.

85b8f7d... by Łukasz Zemczak

Import patches-unapplied version 71ubuntu3 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: f7366b096fe0e217a3f982c2389048b55b8efcc3

New changelog entries:
  * Save the number of ESPs found to /var/lib/partman/efi_esp_count for
    partman-auto. (LP: #1766945)

f7366b0... by Łukasz Zemczak

Import patches-unapplied version 71ubuntu2 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 8f0e5b4c6ed279f49ccf11ea11e3df0d158f7c4b

New changelog entries:
  * Do not ask the user about forcing UEFI installation if there are BIOS
    compatibility mode installed systems as those will still be bootable from
    grub if we proceed in UEFI mode. (LP: #1668148)
  * debian/partman-efi.templates: remove the partman-efi/non_efi_system
    template as we no longer need it.

8f0e5b4... by Mathieu Trudel-Lapierre

Import patches-unapplied version 71ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 4013e020c567c8bf396ec572a8b8d7761ddc660b

New changelog entries:
  * Resynchronise with Debian. Remaining changes:
    - Remove efi-modules dependency; it seems to be built into Ubuntu
      kernels now.
    - Require partman-base >= 129 to support a null value for the name.
    - Only force an EFI system partition on ia64.
    - Allow x86/macs booted in legacy mode to use EFI System partitions.

4013e02... by Christian Perrier

Import patches-unapplied version 71 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d269e80353bb49a8075e6b562109e84bfb9283eb

New changelog entries:
  [ Updated translations ]
  * Hebrew (he.po) by Lior Kaplan

d269e80... by Christian Perrier

Import patches-unapplied version 70 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3442d3ac45c97bedac90b6b7ef8830b575e5b5d1

New changelog entries:
  [ Updated translations ]
  * Turkish (tr.po) by Mert Dirik

3442d3a... by Christian Perrier

Import patches-unapplied version 69 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7cedb1e86645333edfbf1d8da869de963e17920a

New changelog entries:
  [ Updated translations ]
  * Portuguese (Brazil) (pt_BR.po) by Adriano Rafael Gomes

7cedb1e... by Christian Perrier

Import patches-unapplied version 68 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8d9d9cd57b110db7ecf310dc89105418db492cb0

New changelog entries:
  [ Updated translations ]
  * Marathi (mr.po) by sampada

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/update.d/efi_sync_flag b/update.d/efi_sync_flag
index c95dbf8..ce44b15 100755
--- a/update.d/efi_sync_flag
+++ b/update.d/efi_sync_flag
@@ -3,8 +3,6 @@
3# This script removes the efi flag for partitions whose method is not3# This script removes the efi flag for partitions whose method is not
4# efi and sets it for partition whose method is efi4# efi and sets it for partition whose method is efi
55
6[ -e /var/lib/partman/efi ] || exit 0
7
8. /lib/partman/lib/base.sh6. /lib/partman/lib/base.sh
97
10dev=$18dev=$1
diff --git a/update.d/efi_visuals b/update.d/efi_visuals
index e9fc8e0..3d5ca63 100755
--- a/update.d/efi_visuals
+++ b/update.d/efi_visuals
@@ -2,8 +2,6 @@
22
3. /usr/share/debconf/confmodule3. /usr/share/debconf/confmodule
44
5[ -e /var/lib/partman/efi ] || exit 0
6
7dev=$15dev=$1
8num=$26num=$2
9id=$37id=$3

Subscribers

People subscribed via source and target branches