Bug#839552: linux: please add nls_ascii to fat-modules udeb

[Cyril Brulebois <kibi@debian.org>]

Source: linux
Version: 4.7.5-1
Severity: important
Tags: d-i patch

Hi,

Please merge the attached patch to fix a regression with EFI-related
mounts within d-i after the iocharset change in 4.7.2-1, as discussed
earlier on #debian-boot.

Thanks for considering.


KiBi.

>From b070d6c03057027664fef13f154a29d9f81cc0f6 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Sat, 1 Oct 2016 23:40:54 +0200
Subject: [PATCH] Add nls_ascii to the fat-modules udeb.

See commit 0e156c15e31ac4f3e160a6ac262b172d0390d7e8 for the details
about utf8 vs. ascii iocharset for FAT. This fixes a regression with
EFI-related mounts within the Debian Installer.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
 debian/changelog                     | 6 ++++++
 debian/installer/modules/fat-modules | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29fdb48..4f700c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 linux (4.7.5-2) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * debian/bin/gencontrol.py: Fix cross-build-dependencies if invoked under
     dpkg-buildpackage
 
+  [ Cyril Brulebois ]
+  * Add nls_ascii to the fat-modules udeb, following the change of
+    iocharset default in 4.7.2-1. This fixes a regression with EFI-related
+    mounts within the Debian Installer.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 26 Sep 2016 22:27:31 +0100
 
 linux (4.7.5-1) unstable; urgency=medium
diff --git a/debian/installer/modules/fat-modules b/debian/installer/modules/fat-modules
index 37e6d05..377ae03 100644
--- a/debian/installer/modules/fat-modules
+++ b/debian/installer/modules/fat-modules
@@ -4,3 +4,5 @@ vfat
 nls_cp437 ?
 # the default i/o character set for fat (as of 2.6.25)
 nls_utf8 ?
+# the default i/o character set for fat (as of 4.7.2-1)
+nls_ascii ?
-- 
2.1.4