diff -Nru partman-base-187ubuntu3/debian/changelog partman-base-192ubuntu1/debian/changelog --- partman-base-187ubuntu3/debian/changelog 2016-06-23 11:18:24.000000000 +0000 +++ partman-base-192ubuntu1/debian/changelog 2017-07-27 07:10:29.000000000 +0000 @@ -1,3 +1,87 @@ +partman-base (192ubuntu1) bionic; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Ubiquity integration: If PARTMAN_NO_COMMIT is set, then exit rather + than running commit.d and finish.d scripts; add a partman-commit + script; dump extra information to /var/lib/partman/snoop if + PARTMAN_SNOOP is set; check for per-menu 'no_show_choices' file in + ask_user and don't reshow the menu if it exists. + - Don't skip over dmraid devices if the user chooses not to activate + them. + - If the only thing mounted on a disk is the installation medium and it + uses more or less the whole disk, then silently exclude that disk; if + the installation medium is mounted but doesn't use the whole disk, + issue a warning that partitioning may be difficult; if anything else + is mounted, offer to unmount it. partman/filter_mounted=false disables + this. + - debian/control: replace harddrive-detection Depends with the specific + disk-detect version needed (>= 1.95ubuntu4) to support multipath-tools + 0.5.0. There are no other harddrive-detection providers yet anyway. + - Multipath support: + - lib/base.sh: is_multipath_part(): Use 'p' (not '-part') as multipath + disk-partition separator. + - lib/base.sh: humandev(): Accept spaces in multipath WWID. + - init.d/parted: part_of_multipath(): Update grep expression for more + recent output of 'multipath -l'. + - lib/base.sh: drop the p separator for multipath partitions + + -- Dimitri John Ledkov Thu, 27 Jul 2017 08:10:29 +0100 + +partman-base (192) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/isinstallable: drop support for unsupported mips platforms. + + [ Karsten Merker ] + * For systems that are known to have their boot firmware on an mmcblk + device, protect the firmware area on all mmcblk devices (and not + only on mmcblk0) from being clobbered during guided partitioning + and add missing whitespace to the corresponding log output. + (Closes: #854822) + + -- Cyril Brulebois Mon, 26 Jun 2017 00:11:48 +0200 + +partman-base (191) unstable; urgency=medium + + [ Mathieu Trudel-Lapierre ] + * init.d/parted: part_of_multipath(): Update grep expression for more + recent output of 'multipath -l'. + * lib/base.sh: humandev(): Accept spaces in multipath WWID. + + [ Cyril Brulebois ] + * Merge Mathieu's work, with apologies for the delay. + + -- Cyril Brulebois Fri, 10 Feb 2017 19:24:29 +0100 + +partman-base (190) unstable; urgency=medium + + [ Viktor Mihajlovski ] + * Add disk label type to device directory, such that + e.g. partman-partitioning can elect dasd partitioning table for dasd + drives. + + [ Dimitri John Ledkov ] + * On s390[x], prevent using extended partitions on DASD drives that can + only hold 3 partitions. Parted doesn't have special knowledge about + that and claims that msdos partition table on DASD drives can hold + the usual maximum number of partitions types. + + -- Christian Perrier Sun, 13 Nov 2016 07:45:31 +0100 + +partman-base (189) unstable; urgency=medium + + [ Colin Watson ] + * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. + + -- Christian Perrier Sun, 07 Feb 2016 17:01:43 +0100 + +partman-base (188) unstable; urgency=medium + + [ Updated translations ] + * Thai (th.po) by Theppitak Karoonboonyanan + + -- Christian Perrier Fri, 02 Oct 2015 12:31:01 +0200 + partman-base (187ubuntu3) yakkety; urgency=medium * On s390[x], Prevent using extended partitions on DASD drives that can @@ -5194,4 +5278,3 @@ * First version. -- Anton Zinoviev Wed, 27 Aug 2003 07:03:28 +0200 - diff -Nru partman-base-187ubuntu3/debian/control partman-base-192ubuntu1/debian/control --- partman-base-187ubuntu3/debian/control 2015-08-10 14:02:19.000000000 +0000 +++ partman-base-192ubuntu1/debian/control 2017-07-27 07:10:29.000000000 +0000 @@ -5,8 +5,8 @@ XSBC-Original-Maintainer: Debian Install System Team Uploaders: Anton Zinoviev , Colin Watson , Christian Perrier , Max Vozeler Build-Depends: debhelper (>= 9), dh-autoreconf, dh-di (>= 2), pkg-config, po-debconf (>= 0.5.0), libparted-dev (>= 2.2) -XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-base.git -XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/partman-base.git +XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/partman-base.git +XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/partman-base.git Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-base/ubuntu Package: partman-base diff -Nru partman-base-187ubuntu3/debian/isinstallable partman-base-192ubuntu1/debian/isinstallable --- partman-base-187ubuntu3/debian/isinstallable 2015-08-10 14:02:19.000000000 +0000 +++ partman-base-192ubuntu1/debian/isinstallable 2017-07-27 07:10:29.000000000 +0000 @@ -1,16 +1,6 @@ #!/bin/sh case "`archdetect`" in - # parted does not properly edit dvh disk labels - mips/r4k-ip22 | mips/r5k-ip22 | mips/r8k-ip26 | mips/r10k-ip28) - return 1 - ;; - mips/r10k-ip27 | mips/r12k-ip27) - return 1 - ;; - mips/r5k-ip32 | mips/r10k-ip32 | mips/r12k-ip32) - return 1 - ;; *) return 0; esac diff -Nru partman-base-187ubuntu3/debian/po/be.po partman-base-192ubuntu1/debian/po/be.po --- partman-base-187ubuntu3/debian/po/be.po 2015-08-10 14:04:08.000000000 +0000 +++ partman-base-192ubuntu1/debian/po/be.po 2017-07-27 07:10:29.000000000 +0000 @@ -23,9 +23,10 @@ "Project-Id-Version: be\n" "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" "POT-Creation-Date: 2011-07-27 22:47+0000\n" -"PO-Revision-Date: 2012-01-18 01:58+0300\n" -"Last-Translator: Viktar Siarheichyk \n" -"Language-Team: Belarusian \n" +"PO-Revision-Date: 2015-12-21 15:13+0300\n" +"Last-Translator: Viktar Siarheichyk \n" +"Language-Team: Debian l10n team for Belarusian \n" "Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru partman-base-187ubuntu3/debian/po/da.po partman-base-192ubuntu1/debian/po/da.po --- partman-base-187ubuntu3/debian/po/da.po 2015-08-10 14:04:08.000000000 +0000 +++ partman-base-192ubuntu1/debian/po/da.po 2017-07-27 07:10:29.000000000 +0000 @@ -39,7 +39,7 @@ "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n" "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" "POT-Creation-Date: 2011-07-27 22:47+0000\n" -"PO-Revision-Date: 2015-03-05 20:12+0200\n" +"PO-Revision-Date: 2015-08-16 20:20+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: \n" "Language: da\n" diff -Nru partman-base-187ubuntu3/debian/po/th.po partman-base-192ubuntu1/debian/po/th.po --- partman-base-187ubuntu3/debian/po/th.po 2015-08-10 14:02:19.000000000 +0000 +++ partman-base-192ubuntu1/debian/po/th.po 2017-07-27 07:10:29.000000000 +0000 @@ -4,9 +4,9 @@ # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # # Thai translation of debian-installer. -# Copyright (C) 2006-2011 Software in the Public Interest, Inc. +# Copyright (C) 2006-2015 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. -# Theppitak Karoonboonyanan , 2006-2011. +# Theppitak Karoonboonyanan , 2006-2015. # # # Translations from iso-codes: @@ -14,18 +14,17 @@ # Translations taken from ICU SVN on 2007-09-09 # Free Software Foundation, Inc., 2002,2003,2004 # Alastair McKinstry , 2002, 2004 -# Translations from KDE: -# - Thanomsub Noppaburana -# Thanomsub Noppaburana (Translations from KDE) -# Theppitak Karoonboonyanan , 2005-2011 +# Translations from KDE: +# Thanomsub Noppaburana +# Theppitak Karoonboonyanan , 2005-2015 # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" "POT-Creation-Date: 2011-07-27 22:47+0000\n" -"PO-Revision-Date: 2011-08-17 22:42+0700\n" -"Last-Translator: Theppitak Karoonboonyanan \n" +"PO-Revision-Date: 2015-09-30 14:14+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" "Language: th\n" "MIME-Version: 1.0\n" @@ -160,7 +159,7 @@ "If you continue, the changes listed below will be written to the disks. " "Otherwise, you will be able to make further changes manually." msgstr "" -"หากคุณดำเนินการต่อ การเปลี่ยนแปลงในรายการข้างล่างจะถูกเขียนลงดิสก์ มิฉะนั้น " +"หากคุณดำเนินการต่อ การเปลี่ยนแปลงในรายการข้างล่างนี้จะถูกเขียนลงดิสก์ หรือไม่เช่นนั้น " "คุณก็ยังสามารถเปลี่ยนแปลงสิ่งต่างๆ เองเพิ่มเติมได้อีก" #. Type: boolean diff -Nru partman-base-187ubuntu3/debian/po/zh_CN.po partman-base-192ubuntu1/debian/po/zh_CN.po --- partman-base-187ubuntu3/debian/po/zh_CN.po 2015-08-10 14:02:19.000000000 +0000 +++ partman-base-192ubuntu1/debian/po/zh_CN.po 2017-07-27 07:10:29.000000000 +0000 @@ -26,16 +26,17 @@ # YunQiang Su , 2011. # # Mai Hao Hui , 2001 (translations from galeon) -# YunQiang Su , 2010, 2011. +# YunQiang Su , 2010, 2011, 2012, 2013. +# Yangfl , 2017. # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" "POT-Creation-Date: 2011-07-27 22:47+0000\n" -"PO-Revision-Date: 2011-08-11 11:13+0800\n" -"Last-Translator: YunQiang Su \n" -"Language-Team: Chinese (simplified) \n" +"PO-Revision-Date: 2017-06-11 18:20+0800\n" +"Last-Translator: Yangfl \n" +"Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ #. :sl1: #: ../partman-base.templates:1001 msgid "Starting up the partitioner" -msgstr "正在启动 partitioner" +msgstr "正在启动分区程序" #. Type: text #. Description @@ -170,8 +171,8 @@ "If you continue, the changes listed below will be written to the disks. " "Otherwise, you will be able to make further changes manually." msgstr "" -"如果您继续，以下所列出的修改内容将被写入磁盘。否则您将可以进行进一步的手动修" -"改。" +"如果您继续，以下所列出的修改内容将会写入到磁盘中。或者，您也可以手动来进行其" +"它修改。" #. Type: boolean #. Description @@ -180,7 +181,7 @@ msgid "" "WARNING: This will destroy all data on any partitions you have removed as " "well as on the partitions that are going to be formatted." -msgstr "警告：任何已被删除的和将要被格式化的分区上的数据都将被摧毁。" +msgstr "警告：任何已删除和将要格式化的分区上的数据都将被摧毁。" #. Type: text #. Description @@ -195,7 +196,7 @@ #. for example: "partition #6 of IDE0 master as ext3 journaling file system" #: ../partman-base.templates:14001 msgid "partition #${PARTITION} of ${DEVICE} as ${TYPE}" -msgstr "${DEVICE} 设备上的第 ${PARTITION} 分区将被设置为 ${TYPE}" +msgstr "${DEVICE} 设备上的第 ${PARTITION} 分区将设为 ${TYPE}" #. Type: text #. Description @@ -204,14 +205,14 @@ #. for example: "LVM VG Debian, LV Root as ext3 journaling file system" #: ../partman-base.templates:15001 msgid "${DEVICE} as ${TYPE}" -msgstr "${DEVICE} 设备将被设置为 ${TYPE}" +msgstr "${DEVICE} 设备将设为 ${TYPE}" #. Type: text #. Description #. :sl2: #: ../partman-base.templates:16001 msgid "The partition tables of the following devices are changed:" -msgstr "以下设备的分区表已被改变：" +msgstr "以下设备的分区表已改变：" #. Type: select #. Description @@ -242,35 +243,35 @@ "You are editing partition #${PARTITION} of ${DEVICE}. ${OTHERINFO} " "${DESTROYED}" msgstr "" -"您正在编辑 ${DEVICE} 设备上的第 ${PARTITION} 分区。${OTHERINFO}${DESTROYED}" +"您正在编辑 ${DEVICE} 设备上的第 ${PARTITION} 分区。${OTHERINFO} ${DESTROYED}" #. Type: text #. Description #. :sl2: #: ../partman-base.templates:20001 msgid "This partition is formatted with the ${FILESYSTEM}." -msgstr "此分区被格式化为 ${FILESYSTEM}。" +msgstr "此分区已格式化为 ${FILESYSTEM}。" #. Type: text #. Description #. :sl2: #: ../partman-base.templates:21001 msgid "No existing file system was detected in this partition." -msgstr "未在此分区上发现已存在的文件系统。" +msgstr "未在此分区上发现任何已存在的文件系统。" #. Type: text #. Description #. :sl2: #: ../partman-base.templates:22001 msgid "All data in it WILL BE DESTROYED!" -msgstr "其中的所有数据都将被摧毁！" +msgstr "其中的所有数据都将被 [完 全 摧 毁]！" #. Type: note #. Description #. :sl2: #: ../partman-base.templates:23001 msgid "The partition starts from ${FROMCHS} and ends at ${TOCHS}." -msgstr "此分区开始于 ${FROMCHS} 结束于 ${TOCHS} 。" +msgstr "此分区开始于 ${FROMCHS} 结束于 ${TOCHS}。" #. Type: note #. Description @@ -284,14 +285,14 @@ #. :sl1: #: ../partman-base.templates:26001 msgid "Partitions formatting" -msgstr "分区格式化" +msgstr "正在格式化分区" #. Type: text #. Description #. :sl1: #: ../partman-base.templates:27001 msgid "Processing..." -msgstr "执行中..." +msgstr "处理中..." #. Type: text #. Description @@ -315,7 +316,7 @@ #. :sl1: #: ../partman-base.templates:31001 msgid "Finish partitioning and write changes to disk" -msgstr "分区设定结束并将修改写入磁盘" +msgstr "结束分区设定并将修改写入磁盘" #. Type: text #. Description @@ -354,7 +355,7 @@ #. :sl1: #: ../partman-base.templates:37001 msgid "primary" -msgstr "主分区" +msgstr "主" #. Type: text #. Description @@ -362,7 +363,7 @@ #. :sl1: #: ../partman-base.templates:38001 msgid "logical" -msgstr "逻辑分区" +msgstr "逻辑" #. Type: text #. Description @@ -540,7 +541,7 @@ #: ../partman-base.templates:57001 #, no-c-format msgid "Multipath %s (WWID %s)" -msgstr "多重路径(Multipath) %s (通用ID(WWID) %s)" +msgstr "多重路径 (Multipath) %s (WWID %s)" #. Type: text #. Description @@ -548,7 +549,7 @@ #: ../partman-base.templates:58001 #, no-c-format msgid "Multipath %s (partition #%s)" -msgstr "多重路径(Multipath) %s (第 #%s 分区)" +msgstr "多重路径 (Multipath) %s (第 #%s 分区)" #. Type: text #. Description @@ -564,7 +565,7 @@ #: ../partman-base.templates:60001 #, no-c-format msgid "ZFS pool %s, volume %s" -msgstr "ZFS pool %s, 卷 %s" +msgstr "ZFS 池 %s，卷 %s" #. Type: text #. Description diff -Nru partman-base-187ubuntu3/init.d/parted partman-base-192ubuntu1/init.d/parted --- partman-base-187ubuntu3/init.d/parted 2016-02-29 14:47:26.000000000 +0000 +++ partman-base-192ubuntu1/init.d/parted 2017-07-27 07:10:29.000000000 +0000 @@ -49,10 +49,8 @@ # The block devices that make up the multipath: # Output looks like "(decoration-symbols) 4:0:0:1 sdc 8:32 ..." # (decoration-symbols are not matched; they may change again, and the spaces differ for last device) - # (there is 1 or more spaces between fields if any disk has 4 letters; e.g., sdaa) for mpdev in $(multipath -l | \ - grep -o '\([#0-9]\+:\)\{3\}[#0-9]\+ \+[hs]d[a-z]\+ \+[0-9]\+:[0-9]\+' | \ - sed 's/ / /' | \ + grep -o '\([#0-9]\+:\)\{3\}[#0-9]\+ [hs]d[a-z]\+ [0-9]\+:[0-9]\+' | \ cut -f2 -d' '); do if [ "$(readlink -f /dev/$mpdev)" = $1 ]; then return 0 diff -Nru partman-base-187ubuntu3/parted_server.c partman-base-192ubuntu1/parted_server.c --- partman-base-187ubuntu3/parted_server.c 2016-06-23 11:15:25.000000000 +0000 +++ partman-base-192ubuntu1/parted_server.c 2017-07-27 07:10:29.000000000 +0000 @@ -1374,9 +1374,9 @@ * the firmware area, resulting in an unbootable system (see * bug #751704). */ - if (is_system_with_firmware_on_disk() && !strcmp(disk->dev->path, "/dev/mmcblk0")) { + if (is_system_with_firmware_on_disk() && !strncmp(disk->dev->path, "/dev/mmcblk", 11)) { disk->needs_clobber = 0; - log("Sunxi/Freescale/AM33XX detected. Disabling ped_disk_clobber" \ + log("Sunxi/Freescale/AM33XX detected. Disabling ped_disk_clobber " \ "for the boot device %s to protect the firmware " \ "area.", disk->dev->path); }