diff -pruN 127/active_partition/basicfilesystems/choices 127ubuntu3/active_partition/basicfilesystems/choices
--- 127/active_partition/basicfilesystems/choices	2014-09-20 10:45:48.000000000 +0000
+++ 127ubuntu3/active_partition/basicfilesystems/choices	2016-11-21 16:42:50.000000000 +0000
@@ -40,6 +40,10 @@ choice_mountpoint () {
 }
 
 choice_options () {
+	if [ "$filesystem" = ntfs ]; then
+		# no mount options support yet (requires translations)
+		return
+	fi
 	db_metaget partman-basicfilesystems/text/options description
 	printf "options\t%s\${!TAB}%.45s\n" "$RET" "$(get_mountoptions $dev $id)"
 }
diff -pruN 127/check.d/check_swap 127ubuntu3/check.d/check_swap
--- 127/check.d/check_swap	2014-09-20 10:45:48.000000000 +0000
+++ 127ubuntu3/check.d/check_swap	2016-11-30 18:33:10.000000000 +0000
@@ -27,7 +27,7 @@ for dev in $DEVICES/*; do
 done
 
 if ! $swap; then
-	db_input critical partman-basicfilesystems/no_swap || true
+	db_input medium partman-basicfilesystems/no_swap || true
 	db_go || true
 	db_get partman-basicfilesystems/no_swap
 	if [ "$RET" = true ]; then
diff -pruN 127/check.d/mountpoint_fat 127ubuntu3/check.d/mountpoint_fat
--- 127/check.d/mountpoint_fat	2014-09-20 10:45:48.000000000 +0000
+++ 127ubuntu3/check.d/mountpoint_fat	2016-11-21 16:42:50.000000000 +0000
@@ -2,6 +2,8 @@
 
 . /lib/partman/lib/base.sh
 
+ARCH="$(archdetect)"
+
 for dev in $DEVICES/*; do
 	[ -d "$dev" ] || continue
 	cd $dev
@@ -27,6 +29,18 @@ for dev in $DEVICES/*; do
 			# filesystem semantics are usually expected, and make the
 			# user choose again.
 			case $mountpoint in
+			    /boot)
+				case $ARCH in
+				    armel/omap)
+					# omap uboot has problems with ext2;
+					# the problems with FAT can be
+					# worked around.
+					continue
+					;;
+				esac
+			    ;;
+			esac
+			case $mountpoint in
 			    /|/boot|/home|/opt|/srv|/tmp|/usr|/usr/local|/var)
 				>"$id/visual_mountpoint"
 				db_subst partman-basicfilesystems/posix_filesystem_required FILESYSTEM "$filesystem"
diff -pruN 127/commit.d/format_swap 127ubuntu3/commit.d/format_swap
--- 127/commit.d/format_swap	2014-09-20 10:45:48.000000000 +0000
+++ 127ubuntu3/commit.d/format_swap	2016-11-21 16:42:50.000000000 +0000
@@ -37,15 +37,27 @@ for dev in $DEVICES/*; do
 				continue
 			fi
 			log "Try to format swap space in $dev/$id"
+			disable_swap "$dev" "$id" || true
 			template=partman-basicfilesystems/progress_swap_formatting
 			open_dialog PARTITION_INFO $id
 			read_line x1 x2 x3 x4 x5 device x6
 			close_dialog
+			rm -f $id/old_uuid
+			if [ -f $id/detected_filesystem ]; then
+				old_fs=$(cat $id/detected_filesystem)
+				if [ "$old_fs" = linux-swap ]; then
+					# Save the old UUID so that we can restore it later.
+					dd if=$device of=$id/old_uuid bs=1 skip=1036 count=16 2>/dev/null || true
+				fi
+			fi
 			db_subst $template PARTITION "$num"
 			db_subst $template DEVICE $(humandev $(cat device))
 			db_progress START 0 3 partman/text/formatting
 			db_progress INFO $template
 			db_progress SET 1
+			# According to Szabolcs Szakacsits, the NTFS-3g author, it is
+			# safer to format the loop file, rather than the device.
+			[ ! -s loop ] || device="$(cat loop)"
 			if log-output -t partman --pass-stdout \
 			   mkswap $device >/dev/null; then
 				sync
@@ -63,6 +75,12 @@ for dev in $DEVICES/*; do
 				db_go || true
 				exit 1
 			fi
+			if [ -s "$id/old_uuid" ]; then
+				# Restore the old UUID so that systems using UUIDs in
+				# /etc/fstab don't unexpectedly end up without swap.
+				dd if=$id/old_uuid of=$device bs=1 seek=1036 count=16 conv=notrunc 2>/dev/null || true
+			fi
+			rm -f $id/old_uuid
 			>$id/formatted
 		fi
 	done
diff -pruN 127/debian/changelog 127ubuntu3/debian/changelog
--- 127/debian/changelog	2016-11-13 06:48:28.000000000 +0000
+++ 127ubuntu3/debian/changelog	2021-02-08 13:13:01.000000000 +0000
@@ -1,3 +1,42 @@
+partman-basicfilesystems (127ubuntu3) hirsute; urgency=medium
+
+  * Drop dependency on kernel modules for ext2 & fat, these are always
+    built in, and holding up kernel udebs in the archive, whilst not
+    needed. partman-basicfilesystems udeb is unused in Ubuntu, whilst a
+    vendored copy is used in ubiquity.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 08 Feb 2021 13:13:01 +0000
+
+partman-basicfilesystems (127ubuntu2) zesty; urgency=medium
+
+  * Reapply 120ubuntu2 changes:
+  * Set no_swap to false, and lower priority to medium. Having no swap
+    is ok these days, and soon there will be partman-swapfile in use by
+    default providing swapfile support, instead of swap partition.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 Nov 2016 18:34:59 +0000
+
+partman-basicfilesystems (127ubuntu1) zesty; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 21 Nov 2016 16:44:34 +0000
+
 partman-basicfilesystems (127) unstable; urgency=medium
 
   [ Updated translations ]
@@ -48,6 +87,35 @@ partman-basicfilesystems (121) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 28 Jan 2016 05:43:35 +0100
 
+partman-basicfilesystems (120ubuntu2) zesty; urgency=medium
+
+  * Check no_swap to false, and lower priority to medium. Having no swap
+    is ok these days, and soon there will be partman-swapfile in use by
+    default providing swapfile support, instead of swap partition.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 18 Nov 2016 16:52:21 +0000
+
+partman-basicfilesystems (120ubuntu1) xenial; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 22 Dec 2015 15:57:42 -0500
+
 partman-basicfilesystems (120) unstable; urgency=medium
 
   [ Updated translations ]
@@ -128,6 +196,27 @@ partman-basicfilesystems (110) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 08 Mar 2015 16:35:45 +0100
 
+partman-basicfilesystems (109ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 04 Jan 2015 21:52:15 +0000
+
 partman-basicfilesystems (109) unstable; urgency=low
 
   [ Updated translations ]
@@ -136,6 +225,27 @@ partman-basicfilesystems (109) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Wed, 17 Dec 2014 08:31:42 +0100
 
+partman-basicfilesystems (108ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 11 Dec 2014 12:15:36 +0000
+
 partman-basicfilesystems (108) unstable; urgency=low
 
   [ Updated translations ]
@@ -151,6 +261,27 @@ partman-basicfilesystems (107) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Wed, 19 Nov 2014 08:16:14 +0100
 
+partman-basicfilesystems (106ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 19 Nov 2014 08:58:34 +0000
+
 partman-basicfilesystems (106) unstable; urgency=low
 
   [ Updated translations ]
@@ -165,6 +296,27 @@ partman-basicfilesystems (105) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Fri, 14 Nov 2014 07:07:29 +0100
 
+partman-basicfilesystems (104ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 11 Nov 2014 14:29:36 +0000
+
 partman-basicfilesystems (104) unstable; urgency=low
 
   [ Updated translations ]
@@ -238,6 +390,30 @@ partman-basicfilesystems (98) unstable;
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 04 Sep 2014 11:52:30 +0100
 
+partman-basicfilesystems (97ubuntu1) utopic; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 07 Jul 2014 11:06:56 +0100
+
 partman-basicfilesystems (97) unstable; urgency=medium
 
   * dosfstools has a good deal of Linux-specific code and isn't currently
@@ -263,6 +439,35 @@ partman-basicfilesystems (96) unstable;
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 06 Jul 2014 01:32:41 +0100
 
+partman-basicfilesystems (95ubuntu1) utopic; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+    - Use mkfs.fat to create FAT filesystems, since libparted cannot handle
+      doing that on non-512-sector disks.
+    - Always use mkfs.ext2 to create ext2 filesystems, since libparted's
+      ext2 code is deprecated and can't handle large sector sizes.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 05 Jun 2014 11:08:57 +0100
+
 partman-basicfilesystems (95) unstable; urgency=low
 
   [ Updated translations ]
@@ -335,6 +540,41 @@ partman-basicfilesystems (87) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Fri, 13 Dec 2013 19:44:18 +0100
 
+partman-basicfilesystems (86ubuntu2) trusty; urgency=low
+
+  * Use mkfs.fat rather than mkdosfs if it exists (LP: #1257702).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 04 Dec 2013 14:34:24 +0000
+
+partman-basicfilesystems (86ubuntu1) trusty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+    - Use mkdosfs to create FAT filesystems, since libparted cannot handle
+      doing that on non-512-sector disks.
+    - Always use mkfs.ext2 to create ext2 filesystems, since libparted's
+      ext2 code is deprecated and can't handle large sector sizes.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 03 Dec 2013 13:57:42 +0000
+
 partman-basicfilesystems (86) unstable; urgency=low
 
   * Make nodiratime and discard mount options translatable (closes:
@@ -361,6 +601,35 @@ partman-basicfilesystems (85) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 09 Nov 2013 21:52:14 +0100
 
+partman-basicfilesystems (84ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+    - Use mkdosfs to create FAT filesystems, since libparted cannot handle
+      doing that on non-512-sector disks.
+    - Always use mkfs.ext2 to create ext2 filesystems, since libparted's
+      ext2 code is deprecated and can't handle large sector sizes.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 01 Oct 2013 10:29:00 +0100
+
 partman-basicfilesystems (84) unstable; urgency=low
 
   * Add nodiratime option for ext2, and noatime, nodiratime, relatime, and
@@ -423,6 +692,40 @@ partman-basicfilesystems (79) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 13 Jul 2013 13:36:46 +0200
 
+partman-basicfilesystems (78ubuntu2) saucy; urgency=low
+
+  * Always use mkfs.ext2 to create ext2 filesystems, since libparted's ext2
+    code is deprecated and can't handle large sector sizes (LP: #1215458).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 12 Sep 2013 13:29:43 +0100
+
+partman-basicfilesystems (78ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+    - Use mkdosfs to create FAT filesystems, since libparted cannot handle
+      doing that on non-512-sector disks.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 28 May 2013 14:04:11 +0100
+
 partman-basicfilesystems (78) unstable; urgency=low
 
   [ Updated translations ]
@@ -437,6 +740,51 @@ partman-basicfilesystems (77) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 05 Nov 2012 06:50:23 +0100
 
+partman-basicfilesystems (76ubuntu4) raring; urgency=low
+
+  * Fix dangerous reuse of $device in format_basicfilesystems, introduced in
+    76ubuntu3.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 18 Jan 2013 18:41:39 +0000
+
+partman-basicfilesystems (76ubuntu3) raring; urgency=low
+
+  * Explicitly pass logical sector size to mkdosfs.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 18 Jan 2013 18:32:40 +0000
+
+partman-basicfilesystems (76ubuntu2) raring; urgency=low
+
+  * Use mkdosfs to create FAT filesystems, since libparted cannot handle
+    doing that on non-512-sector disks (LP: #1065281).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 17 Jan 2013 23:05:24 +0000
+
+partman-basicfilesystems (76ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 30 Oct 2012 16:27:31 +0000
+
 partman-basicfilesystems (76) unstable; urgency=low
 
   [ Updated translations ]
@@ -454,6 +802,31 @@ partman-basicfilesystems (75) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 23 Sep 2012 11:36:45 +0200
 
+partman-basicfilesystems (74ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+    - Stop using libparted to format swap partitions.
+    - Disable existing swap partitions before formatting them.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 21 Jun 2012 11:04:54 +0100
+
 partman-basicfilesystems (74) unstable; urgency=low
 
   * Team upload
@@ -515,6 +888,44 @@ partman-basicfilesystems (72) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Fri, 15 Jun 2012 13:01:30 +0200
 
+partman-basicfilesystems (71ubuntu3) precise; urgency=low
+
+  * Disable existing swap partitions before formatting them (LP: #905628).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 20 Dec 2011 14:18:01 +0000
+
+partman-basicfilesystems (71ubuntu2) precise; urgency=low
+
+  * Stop using libparted to format swap partitions.  parted 3.0 doesn't
+    support this anyway, and I'm guessing that this may be the cause of
+    blkid sometimes not recognising the swap partition during installation
+    (LP: #709363).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 15 Dec 2011 18:00:08 +0000
+
+partman-basicfilesystems (71ubuntu1) oneiric; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 23 Jul 2011 17:11:47 +0100
+
 partman-basicfilesystems (71) unstable; urgency=low
 
   [ Colin Watson ]
@@ -534,6 +945,33 @@ partman-basicfilesystems (71) unstable;
 
  -- Wouter Verhelst <wouter@debian.org>  Thu, 21 Jul 2011 16:42:18 +0200
 
+partman-basicfilesystems (70ubuntu1) oneiric; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Stop checking ext2 filesystems using libparted, since it can't deal
+      with those created with recent versions of mke2fs.  We were already
+      refraining from checking ext3 and ext4 filesystems using libparted for
+      the same reason.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 03 May 2011 16:34:51 +0100
+
 partman-basicfilesystems (70) unstable; urgency=low
 
   [ Updated translations ]
@@ -541,6 +979,33 @@ partman-basicfilesystems (70) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 23 Apr 2011 21:24:27 +0200
 
+partman-basicfilesystems (69ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Stop checking ext2 filesystems using libparted, since it can't deal
+      with those created with recent versions of mke2fs.  We were already
+      refraining from checking ext3 and ext4 filesystems using libparted for
+      the same reason.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 26 Jan 2011 14:24:14 +0000
+
 partman-basicfilesystems (69) unstable; urgency=low
 
   [ Updated translations ]
@@ -556,6 +1021,33 @@ partman-basicfilesystems (69) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 21 Apr 2011 22:31:43 +0200
 
+partman-basicfilesystems (68ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Stop checking ext2 filesystems using libparted, since it can't deal
+      with those created with recent versions of mke2fs.  We were already
+      refraining from checking ext3 and ext4 filesystems using libparted for
+      the same reason.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 15 Nov 2010 10:58:10 +0000
+
 partman-basicfilesystems (68) unstable; urgency=low
 
   [ Updated translations ]
@@ -578,6 +1070,33 @@ partman-basicfilesystems (68) unstable;
 
  -- Otavio Salvador <otavio@debian.org>  Fri, 12 Nov 2010 16:21:41 -0200
 
+partman-basicfilesystems (67ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT filesystems at boot (fstab pass 1).
+    - Mount FAT (other than EFI System Partitions) and NTFS with
+      umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Stop checking ext2 filesystems using libparted, since it can't deal
+      with those created with recent versions of mke2fs.  We were already
+      refraining from checking ext3 and ext4 filesystems using libparted for
+      the same reason.
+    - Allow armel/omap to use FAT for /boot, since the problems with it can
+      be worked around while it's difficult to use anything else given uboot
+      limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 12 Oct 2010 12:22:58 +0100
+
 partman-basicfilesystems (67) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -716,6 +1235,70 @@ partman-basicfilesystems (64) unstable;
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 11 Jul 2010 18:57:35 +0200
 
+partman-basicfilesystems (63ubuntu7) maverick; urgency=low
+
+  * Revert changes in 63ubuntu6, since method=efi filesystems don't have an
+    acting_filesystem.  Responsibility for mounting /boot/efi now lies with
+    partman-efi.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 03 Sep 2010 13:45:08 +0100
+
+partman-basicfilesystems (63ubuntu6) maverick; urgency=low
+
+  * Automatically mount the first method=efi filesystem we see on /boot/efi.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 18 Jun 2010 15:37:29 +0100
+
+partman-basicfilesystems (63ubuntu5) maverick; urgency=low
+
+  * Don't add umask=007,gid=46 for EFI System Partitions.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 17 Jun 2010 19:17:50 +0100
+
+partman-basicfilesystems (63ubuntu4) lucid; urgency=low
+
+  * Allow armel/omap to use FAT for /boot, since the problems with it can be
+    worked around while it's difficult to use anything else given uboot
+    limitations.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 14 Apr 2010 09:51:57 +0100
+
+partman-basicfilesystems (63ubuntu3) lucid; urgency=low
+
+  * Stop checking ext2 filesystems using libparted, since it can't deal with
+    those created with recent versions of mke2fs (LP: #517349).  We were
+    already refraining from checking ext3 and ext4 filesystems using
+    libparted for the same reason.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 04 Feb 2010 17:03:56 -0800
+
+partman-basicfilesystems (63ubuntu2) karmic; urgency=low
+
+  * Don't check NTFS at boot, since we have no fsck.ntfs right now
+    (LP: #441242).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 06 Oct 2009 22:44:55 +0100
+
+partman-basicfilesystems (63ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+  * Drop ext2 relatime default, as it's now the default in the kernel.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 15 Jun 2009 15:17:28 +0100
+
 partman-basicfilesystems (63) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -758,6 +1341,33 @@ partman-basicfilesystems (63) unstable;
   
  -- Otavio Salvador <otavio@debian.org>  Fri, 12 Jun 2009 16:25:56 -0300
 
+partman-basicfilesystems (62ubuntu2) jaunty; urgency=low
+
+  * When formatting swap partitions, save the old UUID in a file rather than
+    in a shell variable, as the latter approach eats NULs (LP: #336992).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 03 Mar 2009 12:54:26 +0000
+
+partman-basicfilesystems (62ubuntu1) jaunty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Default to mounting ext2 with relatime.
+
+ -- Luke Yelavich <luke@barbiton.yelavich.home>  Tue, 11 Nov 2008 09:01:11 +1100
+
 partman-basicfilesystems (62) unstable; urgency=low
 
   [ Giuseppe Iuculano ]
@@ -805,6 +1415,32 @@ partman-basicfilesystems (61) unstable;
 	
  -- Otavio Salvador <otavio@debian.org>  Tue, 05 Aug 2008 13:49:02 -0300
 
+partman-basicfilesystems (60ubuntu2) intrepid; urgency=low
+
+  * init.d/autouse_swap: We no longer need to skip sataraid partitions.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Wed, 27 Aug 2008 14:27:08 +1000
+
+partman-basicfilesystems (60ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Default to mounting ext2 with relatime.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 24 Jun 2008 11:43:02 +0100
+
 partman-basicfilesystems (60) unstable; urgency=low
 
   [ Frans Pop ]
@@ -818,6 +1454,33 @@ partman-basicfilesystems (60) unstable;
   
  -- Otavio Salvador <otavio@debian.org>  Thu, 08 May 2008 13:33:49 -0300
 
+partman-basicfilesystems (59ubuntu2) intrepid; urgency=low
+
+  * Adjust init.d/auto_mountpoints for move of definitions.sh to
+    lib/base.sh.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 20 Jun 2008 13:09:49 +0100
+
+partman-basicfilesystems (59ubuntu1) intrepid; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - If partman/automount is preseeded to true, automatically mount
+      partitions with usefully-mountable filesystems on subdirectories of
+      /media.
+    - Add minimal support for NTFS partitions using ntfs-3g.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+    - Special case loopmounted filesystems as it's safer to format the
+      underlying file, not the device.
+    - Default to mounting ext2 with relatime.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 07 May 2008 13:02:37 +0100
+
 partman-basicfilesystems (59) unstable; urgency=low
 
   * Use Choices-C in template for mount options selection and build the list
@@ -865,6 +1528,57 @@ partman-basicfilesystems (57) unstable;
 
  -- Frans Pop <fjp@debian.org>  Sat, 29 Dec 2007 22:12:14 +0100
 
+partman-basicfilesystems (56ubuntu4) hardy; urgency=low
+
+  * Disable automounting unless partman/automount is preseeded to true. This
+    makes LP #106209 much less likely to occur, since future installations
+    are less likely to format a partition whose UUID we have in /etc/fstab.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 09 Apr 2008 08:18:47 +0100
+
+partman-basicfilesystems (56ubuntu3) hardy; urgency=low
+
+  * Add Choices-C entries for mount options.
+  * Default to mounting ext2 with relatime (LP: #160450).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 Mar 2008 20:15:18 +0000
+
+partman-basicfilesystems (56ubuntu2) hardy; urgency=low
+
+  [ Colin Watson ]
+  * udev 117 merged all udev tools into a single binary called udevadm.
+    Check for this and use it instead of udevinfo if available.
+
+  [ Evan Dandrea ]
+  * Special case loopmounted filesystems as it's safer to format the
+    underlying file, not the device (LP: #177868).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Mon, 14 Jan 2008 10:17:23 -0500
+
+partman-basicfilesystems (56ubuntu1) hardy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Default to mounting partitions with usefully-mountable filesystems on
+      subdirectories of /media.
+    - Add minimal support for NTFS partitions.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+    - init.d/auto_mountpoints: Use 'rm -f' rather than a more awkward
+      test-then-remove construction.
+    - Adjust Description to note that we provide NTFS support too.
+    - If ntfs-3g is available, try to load the fuse module; if we can do
+      that and the fuseblk filesystem is available, accept that as
+      sufficient NTFS support.
+    - Don't set the nls=utf8 mount option if using ntfs-3g.
+    - mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+      file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+  * debian/control: Add XS-Vcs-Bzr for the Ubuntu branch.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Fri, 23 Nov 2007 14:00:28 -0500
+
 partman-basicfilesystems (56) unstable; urgency=low
 
   * Resolve symlinks before looking up devices in /proc/swaps.
@@ -926,6 +1640,46 @@ partman-basicfilesystems (55) unstable;
 
  -- Frans Pop <fjp@debian.org>  Fri, 06 Jul 2007 00:23:33 +0200
 
+partman-basicfilesystems (54ubuntu4) gutsy; urgency=low
+
+  * mount.d/basic: Close mount's fd 3 so that it doesn't inherit a debconf
+    file descriptor, to prevent log-output hanging when ntfs-3g is in use.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 28 Sep 2007 11:03:53 +0100
+
+partman-basicfilesystems (54ubuntu3) gutsy; urgency=low
+
+  * init.d/auto_mountpoints: Use 'rm -f' rather than a more awkward
+    test-then-remove construction.
+  * Adjust Description to note that we provide NTFS support too.
+  * If ntfs-3g is available, try to load the fuse module; if we can do that
+    and the fuseblk filesystem is available, accept that as sufficient NTFS
+    support.
+  * Don't set the nls=utf8 mount option if using ntfs-3g.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 20 Aug 2007 19:44:25 +0100
+
+partman-basicfilesystems (54ubuntu2) gutsy; urgency=low
+
+  * Backport from trunk (LP: #126328):
+    - Resolve symlinks before looking up devices in /proc/swaps.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 16 Jul 2007 18:03:30 +0100
+
+partman-basicfilesystems (54ubuntu1) gutsy; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Default to mounting partitions with usefully-mountable filesystems on
+      subdirectories of /media.
+    - Add minimal support for NTFS partitions.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+    - When formatting over the top of an existing swap partition, preserve
+      its UUID to avoid leaving systems that use UUIDs in /etc/fstab without
+      swap.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 30 Apr 2007 13:08:02 +0100
+
 partman-basicfilesystems (54) unstable; urgency=low
 
   * Mount vfat filesystems with the utf8 mount option if the locale contains
@@ -957,6 +1711,27 @@ partman-basicfilesystems (52) unstable;
 
  -- Frans Pop <fjp@debian.org>  Tue, 27 Feb 2007 18:18:34 +0100
 
+partman-basicfilesystems (51ubuntu2) feisty; urgency=low
+
+  * Move sanity-checking scripts from finish.d to check.d.
+  * Set maintainer to ubuntu-installer@lists.ubuntu.com.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 20 Feb 2007 19:08:28 +0000
+
+partman-basicfilesystems (51ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Default to mounting partitions with usefully-mountable filesystems on
+      subdirectories of /media.
+    - Add minimal support for NTFS partitions.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT with utf8 and NTFS with nls=utf8.
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+  * When formatting over the top of an existing swap partition, preserve its
+    UUID to avoid leaving systems that use UUIDs in /etc/fstab without swap.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon,  5 Feb 2007 19:40:31 +0000
+
 partman-basicfilesystems (51) unstable; urgency=low
 
   [ Updated translations ]
@@ -972,6 +1747,18 @@ partman-basicfilesystems (51) unstable;
 
  -- Frans Pop <fjp@debian.org>  Wed, 31 Jan 2007 12:21:15 +0100
 
+partman-basicfilesystems (50ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Default to mounting partitions with usefully-mountable filesystems on
+      subdirectories of /media.
+    - Add minimal support for NTFS partitions.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT with utf8 and NTFS with nls=utf8.
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 22 Dec 2006 18:52:03 +0000
+
 partman-basicfilesystems (50) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -1004,6 +1791,19 @@ partman-basicfilesystems (50) unstable;
 
  -- Frans Pop <fjp@debian.org>  Thu, 21 Dec 2006 16:30:56 +0100
 
+partman-basicfilesystems (49ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    - Default to mounting partitions with usefully-mountable filesystems on
+      subdirectories of /media.
+    - Add minimal support for NTFS partitions.
+    - Mount FAT and NTFS filesystems at boot (fstab pass 1).
+    - Mount FAT with utf8 and NTFS with nls=utf8.
+    - Mount FAT and NTFS with umask=007,gid=46 (static group plugdev).
+  * Don't call update_partition when backing up from mount point questions.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 21 Nov 2006 17:37:42 +0000
+
 partman-basicfilesystems (49) unstable; urgency=low
 
   * Add missing debconf dependency.
@@ -1058,6 +1858,26 @@ partman-basicfilesystems (48) unstable;
 
  -- Frans Pop <fjp@debian.org>  Thu, 13 Jul 2006 17:37:47 +0200
 
+partman-basicfilesystems (47ubuntu3) edgy; urgency=low
+
+  * Don't automatically set up mount points for IEEE1394 or USB removable
+    devices (closes: Malone #60552).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 25 Sep 2006 11:24:28 +0100
+
+partman-basicfilesystems (47ubuntu2) edgy; urgency=low
+
+  * Add NTFS to partman-basicfilesystems/posix_filesystem_required check;
+    see Malone #48410.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 13 Sep 2006 18:43:47 +0100
+
+partman-basicfilesystems (47ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 29 Jun 2006 13:55:22 +0100
+
 partman-basicfilesystems (47) unstable; urgency=low
 
   [ Colin Watson ]
@@ -1123,6 +1943,44 @@ partman-basicfilesystems (47) unstable;
 
  -- Joey Hess <joeyh@debian.org>  Wed,  7 Jun 2006 22:16:50 -0400
 
+partman-basicfilesystems (46ubuntu5) dapper; urgency=low
+
+  * Don't use the mountpoint as a default label (closes: Malone #21655).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed,  3 May 2006 12:29:34 +0100
+
+partman-basicfilesystems (46ubuntu4) dapper; urgency=low
+
+  * As noted in Malone #20814, set the utf8 mount option rather than
+    iocharset=utf8 for FAT.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat,  1 Apr 2006 17:32:29 +0100
+
+partman-basicfilesystems (46ubuntu3) dapper; urgency=low
+
+  * Mount FAT with iocharset=utf8; see previous comment about NTFS.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat,  1 Apr 2006 10:28:44 +0100
+
+partman-basicfilesystems (46ubuntu2) dapper; urgency=low
+
+  * Mount FAT and NTFS filesystems at boot (fstab pass 1).
+  * Mount NTFS with nls=utf8, which is always correct for Ubuntu systems and
+    avoids files going missing due to their names containing unconvertable
+    characters (suggestion from Malone bug #25071).
+  * Mount FAT and NTFS with umask=007,gid=46 (static group plugdev), so that
+    users can easily be given privileges to read/write mounted Windows
+    filesystems, and so that the first user can do so automatically (closes:
+    Malone #8048, #25071).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat,  1 Apr 2006 09:59:59 +0100
+
+partman-basicfilesystems (46ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 20 Mar 2006 14:05:15 +0000
+
 partman-basicfilesystems (46) unstable; urgency=low
 
   [ Updated translations ]
@@ -1156,6 +2014,12 @@ partman-basicfilesystems (46) unstable;
 
  -- Frans Pop <fjp@debian.org>  Tue, 24 Jan 2006 21:57:18 +0100
 
+partman-basicfilesystems (45ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 30 Oct 2005 17:58:24 -0500
+
 partman-basicfilesystems (45) unstable; urgency=low
 
   [ Colin Watson ]
@@ -1215,6 +2079,20 @@ partman-basicfilesystems (44) unstable;
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Sep 2005 17:51:49 +0200
 
+partman-basicfilesystems (43ubuntu2) breezy; urgency=low
+
+  * Add minimal support for NTFS partitions, so that they can be added to
+    /etc/fstab automatically, have their mount point changed, etc. (closes:
+    Ubuntu #14236, #16233).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri,  7 Oct 2005 14:36:27 +0100
+
+partman-basicfilesystems (43ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 13 Sep 2005 19:54:06 +0100
+
 partman-basicfilesystems (43) unstable; urgency=low
 
   * Fix mount point sanity check to really reject mount points containing
@@ -1291,6 +2169,19 @@ partman-basicfilesystems (40) unstable;
 
  -- Joey Hess <joeyh@debian.org>  Fri, 15 Jul 2005 17:18:18 +0300
 
+partman-basicfilesystems (39ubuntu2) breezy; urgency=low
+
+  * Default to mounting partitions with usefully-mountable filesystems on
+    subdirectories of /media.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed,  1 Jun 2005 16:58:08 +0100
+
+partman-basicfilesystems (39ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon,  9 May 2005 15:31:26 +0100
+
 partman-basicfilesystems (39) unstable; urgency=low
 
   * Colin Watson
@@ -1331,6 +2222,12 @@ partman-basicfilesystems (39) unstable;
 
  -- Colin Watson <cjwatson@debian.org>  Thu,  5 May 2005 11:44:24 +0100
 
+partman-basicfilesystems (38ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 21 Apr 2005 22:14:21 +1000
+
 partman-basicfilesystems (38) unstable; urgency=low
 
   * Note that this includes fixes for substitution bugs in translated
@@ -1364,6 +2261,18 @@ partman-basicfilesystems (37) unstable;
 
  -- Joey Hess <joeyh@debian.org>  Tue, 11 Jan 2005 15:00:22 -0500
 
+partman-basicfilesystems (36ubuntu2) hoary; urgency=low
+
+  * Add draft Xhosa translation.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 22 Mar 2005 14:07:23 +0000
+
+partman-basicfilesystems (36ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Colin Watson <cjwatson@canonical.com>  Fri, 29 Oct 2004 17:50:24 +0100
+
 partman-basicfilesystems (36) unstable; urgency=low
 
   * Updated translations: 
@@ -1613,6 +2522,13 @@ partman-basicfilesystems (27) unstable;
   
  -- Anton Zinoviev <zinoviev@debian.org>  Tue, 20 Jul 2004 15:53:41 +0300
 
+partman-basicfilesystems (26ubuntu1) warty; urgency=low
+
+  * Set pass field to 0 for FAT filesystems, to prevent filesystem checks
+    that sometimes behave strangely (closes: Ubuntu #1912).
+
+ -- Colin Watson <cjwatson@canonical.com>  Wed,  6 Oct 2004 02:44:52 +0100
+
 partman-basicfilesystems (26) unstable; urgency=low
 
   * Updated translations: 
@@ -2151,6 +3067,3 @@ partman-basicfilesystems (2) never relea
 
  -- Anton Zinoviev <zinoviev@debian.org>  Wed, 12 Nov 2003 16:55:08 +0200
 
-Local Variables:
-coding: utf-8
-End:
diff -pruN 127/debian/control 127ubuntu3/debian/control
--- 127/debian/control	2016-01-30 04:07:17.000000000 +0000
+++ 127ubuntu3/debian/control	2021-02-08 13:12:54.000000000 +0000
@@ -1,17 +1,19 @@
 Source: partman-basicfilesystems
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Anton Zinoviev <zinoviev@debian.org>, 
            Colin Watson <cjwatson@debian.org>,
            Christian Perrier <bubulle@debian.org>
 Build-Depends: debhelper (>= 9), dh-di, po-debconf (>= 0.5.0)
-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/partman-basicfilesystems.git
-Vcs-Git: https://anonscm.debian.org/git/d-i/partman-basicfilesystems.git
+XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/partman-basicfilesystems.git
+XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/partman-basicfilesystems.git
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-basicfilesystems/ubuntu
 
 Package: partman-basicfilesystems
 Package-Type: udeb
 Architecture: any
-Depends: ${misc:Depends}, e2fsprogs-udeb, ext2-modules, fat-modules, dosfstools-udeb [linux-any]
+Depends: ${misc:Depends}, e2fsprogs-udeb, dosfstools-udeb [linux-any], partconf-mkfstab (>= 1.09)
 Provides: partman-filesystem
 Description: Add to partman support for ext2, linux-swap, fat16, fat32 and ntfs
diff -pruN 127/debian/partman-basicfilesystems.templates 127ubuntu3/debian/partman-basicfilesystems.templates
--- 127/debian/partman-basicfilesystems.templates	2014-09-20 10:45:48.000000000 +0000
+++ 127ubuntu3/debian/partman-basicfilesystems.templates	2016-11-30 18:33:10.000000000 +0000
@@ -45,7 +45,7 @@ _Description: Go back to the menu and co
 
 Template: partman-basicfilesystems/no_swap
 Type: boolean
-Default: true
+Default: false
 # :sl2:
 _Description: Do you want to return to the partitioning menu?
  You have not selected any partitions for use as swap space. Enabling swap
@@ -416,3 +416,9 @@ _Description: Go back to the menu and co
  the partition will be used as is. This means that you may not be able
  to boot from your hard disk.
 
+Template: partman/automount
+Type: boolean
+Default: false
+Description: for internal use; can be preseeded
+ Set to true to automount interesting-looking partitions under /media.
+
diff -pruN 127/fstab.d/basic 127ubuntu3/fstab.d/basic
--- 127/fstab.d/basic	2015-05-07 09:24:42.000000000 +0000
+++ 127ubuntu3/fstab.d/basic	2016-11-21 16:42:50.000000000 +0000
@@ -85,7 +85,11 @@ for dev in $DEVICES/*; do
 						options="$options,utf8"
 					fi
 				fi
-				echo "$path" "$mountpoint" vfat $options 0 0
+				# base-passwd defines gid 46 as group plugdev
+				if [ "$method" != efi ]; then
+					options="$options,umask=007,gid=46"
+				fi
+				echo "$path" "$mountpoint" vfat $options 0 1
 			fi
 			;;
 		    ntfs)
@@ -95,7 +99,8 @@ for dev in $DEVICES/*; do
 			if [ "$utf8" ] && [ ! -f /var/lib/partman/ntfs-3g ]; then
 				options="$options,nls=utf8"
 			fi
-			echo "$path" "$mountpoint" ntfs $options 0 0
+			# base-passwd defines gid 46 as group plugdev
+			echo "$path" "$mountpoint" ntfs $options,umask=007,gid=46 0 0
 			;;
 		esac
 	done
diff -pruN 127/init.d/auto_mountpoints 127ubuntu3/init.d/auto_mountpoints
--- 127/init.d/auto_mountpoints	1970-01-01 00:00:00.000000000 +0000
+++ 127ubuntu3/init.d/auto_mountpoints	2016-11-21 16:42:50.000000000 +0000
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Only run the first time.
+if [ -f /var/lib/partman/auto_mountpoints ]; then
+	exit 0
+fi
+[ -d /var/lib/partman ] || mkdir /var/lib/partman
+touch /var/lib/partman/auto_mountpoints
+
+. /lib/partman/lib/base.sh
+
+db_get partman/automount
+if [ "$RET" = false ]; then
+	exit 0
+fi
+
+if type udevadm >/dev/null 2>&1; then
+	udevinfo () {
+		udevadm info "$@"
+	}
+fi
+
+partitions=
+for dev in $DEVICES/*; do
+	[ -d "$dev" ] || continue
+	cd $dev
+	open_dialog PARTITIONS
+	while { read_line num id size type fs path name; [ "$id" ]; }; do
+		if udevinfo -q env -n "$path" 2>/dev/null | egrep -q 'ID_PATH=(pci-[^-]*-)?(ieee1394|usb)'; then
+			continue
+		fi
+		[ -f $id/detected_filesystem ] || continue
+		fs=$(cat $id/detected_filesystem)
+		if [ "$name" ]; then
+			mountpoint="$(/usr/lib/partconf/mountpoint "$path" "$fs" "$name")"
+		else
+			mountpoint="$(/usr/lib/partconf/mountpoint "$path" "$fs")"
+		fi
+		if [ "$mountpoint" ]; then
+			partitions="$partitions
+$dev,$id,$fs,$mountpoint"
+		fi
+	done
+	close_dialog
+done
+
+IFS_SAVE="$IFS"
+IFS='
+'
+for part in $partitions; do
+	IFS="$IFS_SAVE"
+	dev="${part%%,*}"
+	cdr="${part#*,}"
+	id="${cdr%%,*}"
+	cdr="${cdr#*,}"
+	fs="${cdr%%,*}"
+	mountpoint="${cdr#*,}"
+
+	[ -d "$dev/$id" ] || continue
+
+	if [ -f "$dev/$id/method" ]; then
+		method="$(cat $dev/$id/method)"
+		if [ "$method" ]; then
+			# Already used for something else.
+			continue
+		fi
+	fi
+
+	echo keep >"$dev/$id/method"
+	rm -f "$dev/$id/format"
+	>"$dev/$id/use_filesystem"
+	echo "$fs" >"$dev/$id/filesystem"
+	mkdir -p "$dev/$id/options"
+	echo "$mountpoint" >"$dev/$id/mountpoint"
+
+	update_partition "$dev" "$id"
+
+	IFS='
+'
+done
+IFS="$IFS_SAVE"
diff -pruN 127/init.d/_numbers 127ubuntu3/init.d/_numbers
--- 127/init.d/_numbers	2011-01-19 04:57:21.000000000 +0000
+++ 127ubuntu3/init.d/_numbers	2016-11-21 16:42:50.000000000 +0000
@@ -1,2 +1,3 @@
 03 kernelmodules_basicfilesystems
+75 auto_mountpoints
 80 autouse_swap
