partman-efi

Merge lp:~sil2100/partman-efi/remove_non_efi_system_logic into lp:~ubuntu-core-dev/partman-efi/ubuntu

  1. remove_non_efi_system_logic
  2. Merge into ubuntu
Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 691
Proposed branch: lp:~sil2100/partman-efi/remove_non_efi_system_logic
Merge into: lp:~ubuntu-core-dev/partman-efi/ubuntu
Diff against target: 69 lines (+10/-36)
3 files modified
debian/changelog (+10/-0)
debian/partman-efi.templates (+0/-16)
init.d/efi (+0/-20)
To merge this branch: bzr merge lp:~sil2100/partman-efi/remove_non_efi_system_logic
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+342314@code.launchpad.net

Commit message

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. So we rip out all the the non_efi_system logic.

Description of the change

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. So we rip out all the the non_efi_system logic.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-23 16:05:43 +0000
3+++ debian/changelog 2018-03-28 16:28:53 +0000
4@@ -1,3 +1,13 @@
5+partman-efi (71ubuntu2) bionic; urgency=medium
6+
7+ * Do not ask the user about forcing UEFI installation if there are BIOS
8+ compatibility mode installed systems as those will still be bootable from
9+ grub if we proceed in UEFI mode. (LP: #1668148)
10+ * debian/partman-efi.templates: remove the partman-efi/non_efi_system
11+ template as we no longer need it.
12+
13+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 28 Mar 2018 18:16:17 +0200
14+
15 partman-efi (71ubuntu1) xenial; urgency=medium
16
17 * Resynchronise with Debian. Remaining changes:
18
19=== modified file 'debian/partman-efi.templates'
20--- debian/partman-efi.templates 2015-12-23 16:00:16 +0000
21+++ debian/partman-efi.templates 2018-03-28 16:28:53 +0000
22@@ -41,19 +41,3 @@
23 _Description: EFI partition too small
24 EFI System Partitions on this architecture cannot be created with a size
25 less than 35 MB. Please make the EFI System Partition larger.
26-
27-Template: partman-efi/non_efi_system
28-Type: boolean
29-# :sl5:
30-_Description: Force UEFI installation?
31- This machine's firmware has started the installer in UEFI mode but
32- it looks like there may be existing operating systems already
33- installed using "BIOS compatibility mode". If you
34- continue to install Debian in UEFI mode, it might be difficult to
35- reboot the machine into any BIOS-mode operating systems later.
36- .
37- If you wish to install in UEFI mode and don't care about
38- keeping the ability to boot one of the existing systems, you have the
39- option to force that here. If you wish to keep the option to boot an
40- existing operating system, you should choose NOT to force UEFI
41- installation here.
42
43=== modified file 'init.d/efi'
44--- init.d/efi 2015-12-23 16:00:16 +0000
45+++ init.d/efi 2018-03-28 16:28:53 +0000
46@@ -89,23 +89,3 @@
47 done
48
49 log "Found $NUM_ESP ESPs, $NUM_NO non-ESPs"
50-
51-if in_efi_mode && [ $NUM_ESP = 0 ] && [ $NUM_NO -gt 0 ]; then
52- case $ARCH in
53- i386/*|amd64/*)
54- db_fget partman-efi/non_efi_system seen
55- if [ $RET = false ]; then
56- db_input critical partman-efi/non_efi_system || true
57- db_go || exit 1
58- db_fset partman-efi/non_efi_system seen true
59- fi
60- db_get partman-efi/non_efi_system
61- if [ "$RET" = false ]; then
62- log "User chose to ignore UEFI"
63- touch /var/lib/partman/ignore_uefi
64- else
65- log "User chose to continue in UEFI mode"
66- fi
67- ;;
68- esac
69-fi

Subscribers

People subscribed via source and target branches