diff -Nru ubiquity-2.18.8.12/debian/changelog ubiquity-2.18.8.13/debian/changelog --- ubiquity-2.18.8.12/debian/changelog 2016-02-01 16:27:43.000000000 +0000 +++ ubiquity-2.18.8.13/debian/changelog 2016-08-01 20:28:46.000000000 +0000 @@ -1,3 +1,11 @@ +ubiquity (2.18.8.13) trusty; urgency=medium + + * ubiquity/misc.py: fix regex to match against nvme disks. (LP: #1600308) + * Automatic update of included source packages: grub-installer + 1.78ubuntu20.4. + + -- Mathieu Trudel-Lapierre Mon, 01 Aug 2016 14:58:28 -0400 + ubiquity (2.18.8.12) trusty; urgency=medium [ Mathieu Trudel-Lapierre ] diff -Nru ubiquity-2.18.8.12/d-i/manifest ubiquity-2.18.8.13/d-i/manifest --- ubiquity-2.18.8.12/d-i/manifest 2016-02-01 16:24:50.000000000 +0000 +++ ubiquity-2.18.8.13/d-i/manifest 2016-08-01 20:28:46.000000000 +0000 @@ -6,7 +6,7 @@ console-setup 1.70ubuntu8 debian-installer-utils 1.105ubuntu1.14.04.1 flash-kernel 3.0~rc.4ubuntu49.7 -grub-installer 1.78ubuntu20.3 +grub-installer 1.78ubuntu20.4 hw-detect 1.95ubuntu2.1 localechooser 2.49ubuntu5 netcfg 1.116ubuntu2 diff -Nru ubiquity-2.18.8.12/d-i/source/grub-installer/debian/changelog ubiquity-2.18.8.13/d-i/source/grub-installer/debian/changelog --- ubiquity-2.18.8.12/d-i/source/grub-installer/debian/changelog 2015-09-16 17:03:53.000000000 +0000 +++ ubiquity-2.18.8.13/d-i/source/grub-installer/debian/changelog 2016-06-30 20:43:26.000000000 +0000 @@ -1,3 +1,9 @@ +grub-installer (1.78ubuntu20.4) trusty-proposed; urgency=medium + + * Install grub-efi-ia32 on i386/efi platforms (LP: #1592229) + + -- Shih-Yuan Lee (FourDollars) Tue, 14 Jun 2016 10:42:25 +0800 + grub-installer (1.78ubuntu20.3) trusty; urgency=medium * Properly handle systems on which there may be more than 26 disks, and our diff -Nru ubiquity-2.18.8.12/d-i/source/grub-installer/debian/.gitignore ubiquity-2.18.8.13/d-i/source/grub-installer/debian/.gitignore --- ubiquity-2.18.8.12/d-i/source/grub-installer/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ ubiquity-2.18.8.13/d-i/source/grub-installer/debian/.gitignore 2016-06-30 19:28:24.000000000 +0000 @@ -0,0 +1,4 @@ +*.debhelper* +*.substvars +files +grub-installer diff -Nru ubiquity-2.18.8.12/d-i/source/grub-installer/.gitignore ubiquity-2.18.8.13/d-i/source/grub-installer/.gitignore --- ubiquity-2.18.8.12/d-i/source/grub-installer/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ ubiquity-2.18.8.13/d-i/source/grub-installer/.gitignore 2016-06-30 19:28:24.000000000 +0000 @@ -0,0 +1 @@ +ensure-active diff -Nru ubiquity-2.18.8.12/d-i/source/grub-installer/grub-installer ubiquity-2.18.8.13/d-i/source/grub-installer/grub-installer --- ubiquity-2.18.8.12/d-i/source/grub-installer/grub-installer 2015-09-16 17:03:11.000000000 +0000 +++ ubiquity-2.18.8.13/d-i/source/grub-installer/grub-installer 2016-06-30 20:43:26.000000000 +0000 @@ -440,20 +440,33 @@ fi ;; i386/efi|amd64/efi) - if [ "$ARCH" = amd64/efi ]; then - grub_package="grub-efi-amd64-signed" + if [ -f /var/lib/partman/ignore_uefi ]; then + grub_package="grub-pc" else grub_package="grub-efi" - fi - if [ ! -d /target/boot/efi ]; then - # No EFI System Partition, so presumably the partitioner - # believed this to be unnecessary, perhaps because we're - # installing on a pre-existing MBR partition table or - # perhaps because there's a BIOS Boot Partition. In either - # case, the right answer is to fall back to grub-pc. - grub_package="grub-pc" + # Override the package choice if we can figure out the + # right package to use directly + if [ -f /sys/firmware/efi/fw_platform_size ] ; then + SIZE=$(cat /sys/firmware/efi/fw_platform_size) + if [ $SIZE -eq 64 ] ; then + grub_package="grub-efi-amd64-signed" + elif [ $SIZE -eq 32 ] ; then + grub_package="grub-efi-ia32" + fi + fi + if [ ! -d /target/boot/efi ]; then + # No EFI System Partition, so presumably the partitioner + # believed this to be unnecessary, perhaps because we're + # installing on a pre-existing MBR partition table or + # perhaps because there's a BIOS Boot Partition. In either + # case, the right answer is to fall back to grub-pc. + grub_package="grub-pc" + fi fi ;; + i386/*|amd64/*) + grub_package="grub-pc" + ;; powerpc/*) grub_package="grub-ieee1275" experimental_arch @@ -920,7 +933,7 @@ CODE=0 case $ARCH:$grub_package in - *:grub|*:grub-pc|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275) + *:grub|*:grub-pc|*:grub-efi*|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275) info "Running $chroot $ROOT grub-install $grub_install_params \"$bootdev\"" log-output -t grub-installer $chroot $ROOT grub-install $grub_install_params "$bootdev" || CODE=$? ;; @@ -933,7 +946,7 @@ info "grub-install ran successfully" else case $ARCH:$grub_package in - *:grub|*:grub-pc|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275) + *:grub|*:grub-pc|*:grub-efi*|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275) error "Running 'grub-install $grub_install_params \"$bootdev\"' failed." ;; *) @@ -1031,6 +1044,12 @@ } make_active_partition () { + if [ "$grub_package" != "grub-pc" ]; then + # only do this for grub-pc since on EFI $bootdev is a dummy argument + # and looking for a partition table on the wrong or non existing disk + # crashes the installer LP:#1303790 + return + fi bootdisk= bootpart= case $bootdev in @@ -1291,7 +1310,7 @@ ) >$ROOT/boot/grub/$menu_file.new mv $ROOT/boot/grub/$menu_file.new $ROOT/boot/grub/$menu_file ;; - grub-pc) + grub-pc|grub-efi*) if grep -q "^GRUB_TERMINAL=" $ROOT/etc/default/grub; then sed -i $ROOT/etc/default/grub -e "s/^\(GRUB_TERMINAL\)=.*/\1=serial/g" else diff -Nru ubiquity-2.18.8.12/ubiquity/misc.py ubiquity-2.18.8.13/ubiquity/misc.py --- ubiquity-2.18.8.12/ubiquity/misc.py 2016-02-01 16:26:48.000000000 +0000 +++ ubiquity-2.18.8.13/ubiquity/misc.py 2016-08-01 20:28:46.000000000 +0000 @@ -374,7 +374,10 @@ else: # Try the next disk along (which can't also be the CD source). target = os.path.realpath(devices[1].split('\t')[1]) - target = re.sub(r'(/dev/(cciss|ida)/c[0-9]d[0-9]|/dev/[a-z]+).*', + target = re.sub(r'(/dev/(cciss|ida)/c[0-9]d[0-9]|\ + /dev/nvme[0-9]+n[0-9]+|\ + /dev/[a-z]+\ + ).*', r'\1', target) except (IndexError, OSError): pass