Bug#770983: unblock: UEFI installer fixes
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package partman-efi and others - all d-i controlled
packages.
I've spoken to KiBi and he seems happier for me to drive this than
him, so... :-)
We've got quite a few important bugfixes since version 51 of
partman-efi:
1. Major behaviour bug for EFI compliance, caused by the switch to
newer parted (#768788) (add the esp flag)
2. Major dual-boot behaviour fix (#763127), including some new
translations that I've filtered from the debdiff below.
3. Low-risk change to mount options for /boot/efi that fixes a
potential security flaw (#770033)
The complete fix for #763127 also depends on trivial changes in other
packages, but the core logic is in partman-efi. Debdiffs for all are
attached (autotools noise in libdebian-installer filtered).
unblock partman-efi/56
unblock os-prober/1.65
unblock lilo-installer/1.47
unblock libdebian-installer/0.98
unblock grub-installer/1.101
-- System Information:
Debian Release: 7.7
APT prefers stable
APT policy: (500, 'stable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru partman-efi-51/check.d/efi partman-efi-56/check.d/efi
--- partman-efi-51/check.d/efi 2012-09-20 15:45:15.000000000 +0100
+++ partman-efi-56/check.d/efi 2014-11-13 04:02:24.000000000 +0000
@@ -4,6 +4,10 @@
exit 0
fi
+if [ -f /var/lib/partman/ignore_uefi ]; then
+ exit 0
+fi
+
. /lib/partman/lib/base.sh
have_efi=no
diff -Nru partman-efi-51/choose_method/efi/choices partman-efi-56/choose_method/efi/choices
--- partman-efi-51/choose_method/efi/choices 2011-01-19 04:59:04.000000000 +0000
+++ partman-efi-56/choose_method/efi/choices 2014-11-13 04:02:24.000000000 +0000
@@ -9,6 +9,10 @@
exit 0
fi
+if [ -f /var/lib/partman/ignore_uefi ]; then
+ exit 0
+fi
+
db_metaget partman-efi/text/efi description
printf "efi\t${RET}\n"
diff -Nru partman-efi-51/debian/changelog partman-efi-56/debian/changelog
--- partman-efi-51/debian/changelog 2014-10-22 08:38:10.000000000 +0100
+++ partman-efi-56/debian/changelog 2014-11-24 08:02:59.000000000 +0000
@@ -1,3 +1,47 @@
+partman-efi (56) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Force umask for /boot/efi in mount options. Closes: #770033. Thanks to
+ Marc Deslauriers for the patch.
+
+ [ Updated translations ]
+ * German (de.po) by Holger Wansing
+ * Italian (it.po) by Milo Casagrande
+ * Polish (pl.po) by Michał Kułach
+ * Thai (th.po) by Theppitak Karoonboonyanan
+
+ -- Christian Perrier <bubulle@debian.org> Mon, 24 Nov 2014 09:02:59 +0100
+
+partman-efi (54) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Warn the user if we've booted in UEFI mode but we seem to have only
+ non-UEFI existing OS installations - give them the option to switch
+ the installer to non-UEFI mode from this point forwards so they don't
+ break potential dual-boot setup. Closes: #763127
+
+ [ Updated translations ]
+ * Czech (cs.po) by Miroslav Kure
+ * French (fr.po) by Christian Perrier
+ * Galician (gl.po) by Jorge Barreiro
+ * Italian (it.po) by Milo Casagrande
+ * Japanese (ja.po) by Kenshi Muto
+ * Portuguese (pt.po) by Miguel Figueiredo
+ * Slovak (sk.po) by Ivan Masár
+ * Thai (th.po) by Theppitak Karoonboonyanan
+ * Turkish (tr.po) by Mert Dirik
+
+ -- Christian Perrier <bubulle@debian.org> Sun, 16 Nov 2014 08:46:01 +0100
+
+partman-efi (52) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Another fix needed to work with the new parted: for the EFI System
+ Partition, set the new "esp" flag as well. That will make parted use
+ the right GUID for the ESP. Closes: #768788
+
+ -- Christian Perrier <bubulle@debian.org> Tue, 11 Nov 2014 17:43:43 +0100
+
partman-efi (51) unstable; urgency=low
[ Updated translations ]
diff -Nru partman-efi-51/debian/partman-efi.templates partman-efi-56/debian/partman-efi.templates
--- partman-efi-51/debian/partman-efi.templates 2014-09-08 05:51:39.000000000 +0100
+++ partman-efi-56/debian/partman-efi.templates 2014-11-14 04:02:56.000000000 +0000
@@ -41,3 +41,19 @@
_Description: EFI partition too small
EFI System Partitions on this architecture cannot be created with a size
less than 35 MB. Please make the EFI System Partition larger.
+
+Template: partman-efi/non_efi_system
+Type: boolean
+# :sl5:
+_Description: Force UEFI installation?
+ This machine's firmware has started the installer in UEFI mode but
+ it looks like there may be existing operating systems already
+ installed using "BIOS compatibility mode". If you
+ continue to install Debian in UEFI mode, it might be difficult to
+ reboot the machine into any BIOS-mode operating systems later.
+ .
+ If you wish to install in UEFI mode and don't care about
+ keeping the ability to boot one of the existing systems, you have the
+ option to force that here. If you wish to keep the option to boot an
+ existing operating system, you should choose NOT to force UEFI
+ installation here.
diff -Nru partman-efi-51/debian/po/am.po partman-efi-56/debian/po/am.po
diff -Nru partman-efi-51/debian/po/ar.po partman-efi-56/debian/po/ar.po
diff -Nru partman-efi-51/debian/po/ast.po partman-efi-56/debian/po/ast.po
diff -Nru partman-efi-51/debian/po/be.po partman-efi-56/debian/po/be.po
diff -Nru partman-efi-51/debian/po/bg.po partman-efi-56/debian/po/bg.po
diff -Nru partman-efi-51/debian/po/bn.po partman-efi-56/debian/po/bn.po
diff -Nru partman-efi-51/debian/po/bo.po partman-efi-56/debian/po/bo.po
diff -Nru partman-efi-51/debian/po/bs.po partman-efi-56/debian/po/bs.po
diff -Nru partman-efi-51/debian/po/ca.po partman-efi-56/debian/po/ca.po
diff -Nru partman-efi-51/debian/po/cs.po partman-efi-56/debian/po/cs.po
diff -Nru partman-efi-51/debian/po/cy.po partman-efi-56/debian/po/cy.po
diff -Nru partman-efi-51/debian/po/da.po partman-efi-56/debian/po/da.po
diff -Nru partman-efi-51/debian/po/de.po partman-efi-56/debian/po/de.po
diff -Nru partman-efi-51/debian/po/dz.po partman-efi-56/debian/po/dz.po
diff -Nru partman-efi-51/debian/po/el.po partman-efi-56/debian/po/el.po
diff -Nru partman-efi-51/debian/po/eo.po partman-efi-56/debian/po/eo.po
diff -Nru partman-efi-51/debian/po/es.po partman-efi-56/debian/po/es.po
diff -Nru partman-efi-51/debian/po/et.po partman-efi-56/debian/po/et.po
diff -Nru partman-efi-51/debian/po/eu.po partman-efi-56/debian/po/eu.po
diff -Nru partman-efi-51/debian/po/fa.po partman-efi-56/debian/po/fa.po
diff -Nru partman-efi-51/debian/po/fi.po partman-efi-56/debian/po/fi.po
diff -Nru partman-efi-51/debian/po/fr.po partman-efi-56/debian/po/fr.po
diff -Nru partman-efi-51/debian/po/ga.po partman-efi-56/debian/po/ga.po
diff -Nru partman-efi-51/debian/po/gl.po partman-efi-56/debian/po/gl.po
diff -Nru partman-efi-51/debian/po/gu.po partman-efi-56/debian/po/gu.po
diff -Nru partman-efi-51/debian/po/he.po partman-efi-56/debian/po/he.po
diff -Nru partman-efi-51/debian/po/hi.po partman-efi-56/debian/po/hi.po
diff -Nru partman-efi-51/debian/po/hr.po partman-efi-56/debian/po/hr.po
diff -Nru partman-efi-51/debian/po/hu.po partman-efi-56/debian/po/hu.po
diff -Nru partman-efi-51/debian/po/id.po partman-efi-56/debian/po/id.po
diff -Nru partman-efi-51/debian/po/is.po partman-efi-56/debian/po/is.po
diff -Nru partman-efi-51/debian/po/it.po partman-efi-56/debian/po/it.po
diff -Nru partman-efi-51/debian/po/ja.po partman-efi-56/debian/po/ja.po
diff -Nru partman-efi-51/debian/po/ka.po partman-efi-56/debian/po/ka.po
diff -Nru partman-efi-51/debian/po/kk.po partman-efi-56/debian/po/kk.po
diff -Nru partman-efi-51/debian/po/km.po partman-efi-56/debian/po/km.po
diff -Nru partman-efi-51/debian/po/kn.po partman-efi-56/debian/po/kn.po
diff -Nru partman-efi-51/debian/po/ko.po partman-efi-56/debian/po/ko.po
diff -Nru partman-efi-51/debian/po/ku.po partman-efi-56/debian/po/ku.po
diff -Nru partman-efi-51/debian/po/lo.po partman-efi-56/debian/po/lo.po
diff -Nru partman-efi-51/debian/po/lt.po partman-efi-56/debian/po/lt.po
diff -Nru partman-efi-51/debian/po/lv.po partman-efi-56/debian/po/lv.po
diff -Nru partman-efi-51/debian/po/mk.po partman-efi-56/debian/po/mk.po
diff -Nru partman-efi-51/debian/po/ml.po partman-efi-56/debian/po/ml.po
diff -Nru partman-efi-51/debian/po/mr.po partman-efi-56/debian/po/mr.po
diff -Nru partman-efi-51/debian/po/nb.po partman-efi-56/debian/po/nb.po
diff -Nru partman-efi-51/debian/po/ne.po partman-efi-56/debian/po/ne.po
diff -Nru partman-efi-51/debian/po/nl.po partman-efi-56/debian/po/nl.po
diff -Nru partman-efi-51/debian/po/nn.po partman-efi-56/debian/po/nn.po
diff -Nru partman-efi-51/debian/po/pa.po partman-efi-56/debian/po/pa.po
diff -Nru partman-efi-51/debian/po/pl.po partman-efi-56/debian/po/pl.po
diff -Nru partman-efi-51/debian/po/pt.po partman-efi-56/debian/po/pt.po
diff -Nru partman-efi-51/debian/po/pt_BR.po partman-efi-56/debian/po/pt_BR.po
diff -Nru partman-efi-51/debian/po/ro.po partman-efi-56/debian/po/ro.po
diff -Nru partman-efi-51/debian/po/ru.po partman-efi-56/debian/po/ru.po
diff -Nru partman-efi-51/debian/po/se.po partman-efi-56/debian/po/se.po
diff -Nru partman-efi-51/debian/po/si.po partman-efi-56/debian/po/si.po
diff -Nru partman-efi-51/debian/po/sk.po partman-efi-56/debian/po/sk.po
diff -Nru partman-efi-51/debian/po/sl.po partman-efi-56/debian/po/sl.po
diff -Nru partman-efi-51/debian/po/sq.po partman-efi-56/debian/po/sq.po
diff -Nru partman-efi-51/debian/po/sr.po partman-efi-56/debian/po/sr.po
diff -Nru partman-efi-51/debian/po/sv.po partman-efi-56/debian/po/sv.po
diff -Nru partman-efi-51/debian/po/ta.po partman-efi-56/debian/po/ta.po
diff -Nru partman-efi-51/debian/po/te.po partman-efi-56/debian/po/te.po
diff -Nru partman-efi-51/debian/po/templates.pot partman-efi-56/debian/po/templates.pot
diff -Nru partman-efi-51/debian/po/tg.po partman-efi-56/debian/po/tg.po
diff -Nru partman-efi-51/debian/po/th.po partman-efi-56/debian/po/th.po
diff -Nru partman-efi-51/debian/po/tl.po partman-efi-56/debian/po/tl.po
diff -Nru partman-efi-51/debian/po/tr.po partman-efi-56/debian/po/tr.po
diff -Nru partman-efi-51/debian/po/ug.po partman-efi-56/debian/po/ug.po
diff -Nru partman-efi-51/debian/po/uk.po partman-efi-56/debian/po/uk.po
diff -Nru partman-efi-51/debian/po/vi.po partman-efi-56/debian/po/vi.po
diff -Nru partman-efi-51/debian/po/zh_CN.po partman-efi-56/debian/po/zh_CN.po
diff -Nru partman-efi-51/debian/po/zh_TW.po partman-efi-56/debian/po/zh_TW.po
diff -Nru partman-efi-51/fstab.d/efi partman-efi-56/fstab.d/efi
--- partman-efi-51/fstab.d/efi 2012-09-20 15:45:15.000000000 +0100
+++ partman-efi-56/fstab.d/efi 2014-11-19 04:06:51.000000000 +0000
@@ -23,7 +23,7 @@
[ -f "$id/method" ] || continue
method=$(cat $id/method)
[ "$method" = efi ] || continue
- echo "$path" /boot/efi vfat defaults 0 1
+ echo "$path" /boot/efi vfat umask=0077 0 1
seen_efi=1
done
close_dialog
diff -Nru partman-efi-51/init.d/efi partman-efi-56/init.d/efi
--- partman-efi-51/init.d/efi 2013-01-19 02:02:01.000000000 +0000
+++ partman-efi-56/init.d/efi 2014-11-13 04:02:24.000000000 +0000
@@ -30,6 +30,9 @@
gpt_efi_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b
msdos_efi_type=0xef
+NUM_ESP=0
+NUM_NO=0
+
for dev in /var/lib/partman/devices/*; do
[ -d "$dev" ] || continue
cd $dev
@@ -52,6 +55,10 @@
elif [ "$label_type" = gpt ] && \
[ "$(blkid -o value -s PART_ENTRY_TYPE -p "$path" 2>/dev/null)" = "$gpt_efi_type" ]; then
partitions="$partitions $id"
+ else
+ if [ "$fs" != "free" ]; then
+ NUM_NO=$(($NUM_NO + 1))
+ fi
fi
done
close_dialog
@@ -62,7 +69,10 @@
while { read_line flag; [ "$flag" ]; }; do
if [ "$flag" = boot ]; then
efi=yes
+ NUM_ESP=$(($NUM_ESP + 1))
# cannot break here
+ else
+ NUM_NO=$(($NUM_NO + 1))
fi
done
close_dialog
@@ -72,3 +82,18 @@
fi
done
done
+
+log "Found $NUM_ESP ESPs, $NUM_NO non-ESPs"
+
+if [ $NUM_ESP = 0 ] && [ $NUM_NO -gt 0 ]; then
+ db_input critical partman-efi/non_efi_system || true
+ db_go || exit 1
+ db_fset partman-efi/non_efi_system seen true
+ db_get partman-efi/non_efi_system
+ if [ "$RET" = false ]; then
+ log "User chose to ignore UEFI"
+ touch /var/lib/partman/ignore_uefi
+ else
+ log "User chose to continue in UEFI mode"
+ fi
+fi
diff -Nru partman-efi-51/update.d/efi_sync_flag partman-efi-56/update.d/efi_sync_flag
--- partman-efi-51/update.d/efi_sync_flag 2012-09-20 15:45:15.000000000 +0100
+++ partman-efi-56/update.d/efi_sync_flag 2014-11-11 04:02:14.000000000 +0000
@@ -47,6 +47,7 @@
open_dialog SET_FLAGS $id
write_line "$flags"
write_line boot
+ write_line esp
write_line NO_MORE
close_dialog
>$id/bootable
diff -Nru partman-efi-51/update.d/efi_visuals partman-efi-56/update.d/efi_visuals
--- partman-efi-51/update.d/efi_visuals 2011-01-19 04:59:04.000000000 +0000
+++ partman-efi-56/update.d/efi_visuals 2014-11-13 04:02:24.000000000 +0000
@@ -6,6 +6,10 @@
exit 0
fi
+if [ -f /var/lib/partman/ignore_uefi ]; then
+ exit 0
+fi
+
dev=$1
num=$2
id=$3
diff -Nru grub-installer-1.100/debian/changelog grub-installer-1.101/debian/changelog
--- grub-installer-1.100/debian/changelog 2014-10-09 06:26:34.000000000 +0100
+++ grub-installer-1.101/debian/changelog 2014-11-12 15:16:49.000000000 +0000
@@ -1,3 +1,10 @@
+grub-installer (1.101) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Recognise the new ignore_uefi flag from partman-efi.
+
+ -- Steve McIntyre <93sam@debian.org> Mon, 03 Nov 2014 23:31:39 +0000
+
grub-installer (1.100) unstable; urgency=medium
[ Colin Watson ]
diff -Nru grub-installer-1.100/grub-installer grub-installer-1.101/grub-installer
--- grub-installer-1.100/grub-installer 2014-10-07 04:01:04.000000000 +0100
+++ grub-installer-1.101/grub-installer 2014-11-12 15:16:49.000000000 +0000
@@ -329,7 +329,11 @@
fi
;;
i386/efi|amd64/efi)
- grub_package="grub-efi"
+ if [ -f /var/lib/partman/ignore_uefi ]; then
+ grub_package="grub-pc"
+ else
+ grub_package="grub-efi"
+ fi
;;
i386/*|amd64/*)
grub_package="grub-pc"
diff -Nru libdebian-installer-0.97/Makefile.in libdebian-installer-0.98/Makefile.in
diff -Nru libdebian-installer-0.97/aclocal.m4 libdebian-installer-0.98/aclocal.m4
diff -Nru libdebian-installer-0.97/config.guess libdebian-installer-0.98/config.guess
diff -Nru libdebian-installer-0.97/config.sub libdebian-installer-0.98/config.sub
diff -Nru libdebian-installer-0.97/configure libdebian-installer-0.98/configure
diff -Nru libdebian-installer-0.97/debian/changelog libdebian-installer-0.98/debian/changelog
--- libdebian-installer-0.97/debian/changelog 2014-09-25 05:54:36.000000000 +0100
+++ libdebian-installer-0.98/debian/changelog 2014-11-25 17:33:08.000000000 +0000
@@ -1,3 +1,11 @@
+libdebian-installer (0.98) unstable; urgency=low
+
+ [ Steve McIntyre ]
+ * Recognise the new ignore_uefi flag from partman-efi.
+ * Add myself to uploaders.
+
+ -- Steve McIntyre <93sam@debian.org> Tue, 25 Nov 2014 17:32:51 +0000
+
libdebian-installer (0.97) unstable; urgency=low
[ Jérémy Bobbio ]
diff -Nru libdebian-installer-0.97/debian/control libdebian-installer-0.98/debian/control
--- libdebian-installer-0.97/debian/control 2014-09-25 05:37:26.000000000 +0100
+++ libdebian-installer-0.98/debian/control 2014-11-25 17:33:32.000000000 +0000
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Bastian Blank <waldi@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>
+Uploaders: Bastian Blank <waldi@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
Build-Depends: dpkg-dev (>= 1.13.5), debhelper (>= 9), dh-autoreconf, doxygen
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/libdebian-installer.git
diff -Nru libdebian-installer-0.97/depcomp libdebian-installer-0.98/depcomp
diff -Nru libdebian-installer-0.97/doc/Makefile.in libdebian-installer-0.98/doc/Makefile.in
diff -Nru libdebian-installer-0.97/include/Makefile.in libdebian-installer-0.98/include/Makefile.in
diff -Nru libdebian-installer-0.97/include/debian-installer/Makefile.in libdebian-installer-0.98/include/debian-installer/Makefile.in
diff -Nru libdebian-installer-0.97/include/debian-installer/system/Makefile.in libdebian-installer-0.98/include/debian-installer/system/Makefile.in
diff -Nru libdebian-installer-0.97/install-sh libdebian-installer-0.98/install-sh
diff -Nru libdebian-installer-0.97/ltmain.sh libdebian-installer-0.98/ltmain.sh
diff -Nru libdebian-installer-0.97/missing libdebian-installer-0.98/missing
diff -Nru libdebian-installer-0.97/src/Makefile.in libdebian-installer-0.98/src/Makefile.in
diff -Nru libdebian-installer-0.97/src/system/Makefile.in libdebian-installer-0.98/src/system/Makefile.in
diff -Nru libdebian-installer-0.97/src/system/efi.c libdebian-installer-0.98/src/system/efi.c
--- libdebian-installer-0.97/src/system/efi.c 2014-09-25 05:37:26.000000000 +0100
+++ libdebian-installer-0.98/src/system/efi.c 2014-11-12 01:08:26.000000000 +0000
@@ -28,7 +28,14 @@
{
int ret = access("/sys/firmware/efi", R_OK);
if (ret == 0)
- return 1;
+ {
+ /* Have we been told to ignore EFI in partman-efi? */
+ ret = access("/var/lib/partman/ignore_uefi", R_OK);
+ if (ret == 0)
+ return 0;
+ else
+ return 1;
+ }
else
return 0;
}
diff -Nru lilo-installer-1.46/debian/changelog lilo-installer-1.47/debian/changelog
--- lilo-installer-1.46/debian/changelog 2014-09-10 13:29:24.000000000 +0100
+++ lilo-installer-1.47/debian/changelog 2014-11-25 17:38:14.000000000 +0000
@@ -1,3 +1,11 @@
+lilo-installer (1.47) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Recognise the new ignore_uefi flag from partman-efi.
+ * Add myself to uploaders.
+
+ -- Steve McIntyre <93sam@debian.org> Tue, 25 Nov 2014 17:37:35 +0000
+
lilo-installer (1.46) unstable; urgency=low
[ Updated translations ]
diff -Nru lilo-installer-1.46/debian/control lilo-installer-1.47/debian/control
--- lilo-installer-1.46/debian/control 2013-07-13 10:23:06.000000000 +0100
+++ lilo-installer-1.47/debian/control 2014-11-25 17:38:34.000000000 +0000
@@ -2,7 +2,7 @@
Section: debian-installer
Priority: standard
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Christian Perrier <bubulle@debian.org>
+Uploaders: Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
Build-Depends: debhelper (>= 9), po-debconf (>= 0.5.0)
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/lilo-installer.git
Vcs-Git: git://anonscm.debian.org/d-i/lilo-installer.git
diff -Nru lilo-installer-1.46/debian/isinstallable lilo-installer-1.47/debian/isinstallable
--- lilo-installer-1.46/debian/isinstallable 2012-09-20 15:43:05.000000000 +0100
+++ lilo-installer-1.47/debian/isinstallable 2014-10-01 00:55:28.000000000 +0100
@@ -11,7 +11,7 @@
# LILO stands a better chance of working in BIOS compatibility mode,
# where /sys/firmware/efi doesn't exist.
# Note: depends on partman-efi to load the efivars module!
- if [ -d /sys/firmware/efi ]; then
+ if [ -d /sys/firmware/efi ] && [ ! -f /var/lib/partman/ignore_uefi ]; then
log "LILO not usable on EFI PCs without BIOS compatibility; use grub-efi"
exit 1
fi
diff -Nru os-prober-1.64/debian/changelog os-prober-1.65/debian/changelog
--- os-prober-1.64/debian/changelog 2014-08-17 22:37:10.000000000 +0100
+++ os-prober-1.65/debian/changelog 2014-11-25 17:41:48.000000000 +0000
@@ -1,3 +1,10 @@
+os-prober (1.65) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * Recognise the new ignore_uefi flag from partman-efi.
+
+ -- Steve McIntyre <93sam@debian.org> Tue, 25 Nov 2014 17:41:06 +0000
+
os-prober (1.64) unstable; urgency=medium
[ Frederic Bonnard ]
diff -Nru os-prober-1.64/debian/control os-prober-1.65/debian/control
--- os-prober-1.64/debian/control 2014-08-17 22:31:54.000000000 +0100
+++ os-prober-1.65/debian/control 2014-11-12 15:18:54.000000000 +0000
@@ -2,7 +2,7 @@
Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Colin Watson <cjwatson@debian.org>, Joey Hess <joeyh@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
+Uploaders: Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.15.7)
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git
diff -Nru os-prober-1.64/os-probes/mounted/x86/05efi os-prober-1.65/os-probes/mounted/x86/05efi
--- os-prober-1.64/os-probes/mounted/x86/05efi 2013-05-19 09:57:50.000000000 +0100
+++ os-prober-1.65/os-probes/mounted/x86/05efi 2014-11-12 15:19:18.000000000 +0000
@@ -8,7 +8,7 @@
type="$3"
# This file is for UEFI platform only
-if [ ! -d /sys/firmware/efi ]; then
+if [ ! -d /sys/firmware/efi ] || [ -f /var/lib/partman/ignore_uefi ]; then
debug "Not on UEFI platform"
exit 1
fi
diff -Nru os-prober-1.64/os-probes/mounted/x86/20microsoft os-prober-1.65/os-probes/mounted/x86/20microsoft
--- os-prober-1.64/os-probes/mounted/x86/20microsoft 2013-05-19 09:57:50.000000000 +0100
+++ os-prober-1.65/os-probes/mounted/x86/20microsoft 2014-11-12 15:19:18.000000000 +0000
@@ -8,7 +8,7 @@
type="$3"
# This script looks for legacy BIOS bootloaders only. Skip if running UEFI
-if [ -d /sys/firmware/efi ]; then
+if [ -d /sys/firmware/efi ] && [ ! -f /var/lib/partman/ignore_uefi ]; then
debug "Skipping legacy bootloaders on UEFI system"
exit 1
fi
Reply to: