Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: partman-basicfilesystems

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

Modifications :
  1. Download patch fstab.d/basic

    --- 127/fstab.d/basic 2015-05-07 09:24:42.000000000 +0000 +++ 127ubuntu2/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
  2. Download patch debian/partman-basicfilesystems.templates

    --- 127/debian/partman-basicfilesystems.templates 2014-09-20 10:45:48.000000000 +0000 +++ 127ubuntu2/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. +
  3. Download patch init.d/auto_mountpoints

    --- 127/init.d/auto_mountpoints 1970-01-01 00:00:00.000000000 +0000 +++ 127ubuntu2/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"
  4. Download patch debian/control

    --- 127/debian/control 2016-01-30 04:07:17.000000000 +0000 +++ 127ubuntu2/debian/control 2016-11-21 16:43:44.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, ext2-modules, fat-modules, dosfstools-udeb [linux-any], partconf-mkfstab (>= 1.09) Provides: partman-filesystem Description: Add to partman support for ext2, linux-swap, fat16, fat32 and ntfs
  5. Download patch active_partition/basicfilesystems/choices

    --- 127/active_partition/basicfilesystems/choices 2014-09-20 10:45:48.000000000 +0000 +++ 127ubuntu2/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)" }
  6. Download patch check.d/check_swap

    --- 127/check.d/check_swap 2014-09-20 10:45:48.000000000 +0000 +++ 127ubuntu2/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
  7. Download patch init.d/_numbers

    --- 127/init.d/_numbers 2011-01-19 04:57:21.000000000 +0000 +++ 127ubuntu2/init.d/_numbers 2016-11-21 16:42:50.000000000 +0000 @@ -1,2 +1,3 @@ 03 kernelmodules_basicfilesystems +75 auto_mountpoints 80 autouse_swap
  8. Download patch commit.d/format_swap

    --- 127/commit.d/format_swap 2014-09-20 10:45:48.000000000 +0000 +++ 127ubuntu2/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
  9. Download patch check.d/mountpoint_fat

    --- 127/check.d/mountpoint_fat 2014-09-20 10:45:48.000000000 +0000 +++ 127ubuntu2/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"
  1. partman-basicfilesystems