Merge lp:~xnox/partman-base/merge-debian into lp:~ubuntu-core-dev/partman-base/ubuntu
- merge-debian
- Merge into ubuntu
Proposed by
Dimitri John Ledkov
Status: | Merged |
---|---|
Merged at revision: | 1411 |
Proposed branch: | lp:~xnox/partman-base/merge-debian |
Merge into: | lp:~ubuntu-core-dev/partman-base/ubuntu |
Diff against target: |
437 lines (+127/-55) 9 files modified
debian/changelog (+84/-1) debian/control (+2/-2) debian/isinstallable (+0/-10) debian/po/be.po (+4/-3) debian/po/da.po (+1/-1) debian/po/th.po (+8/-9) debian/po/zh_CN.po (+25/-24) init.d/parted (+1/-3) parted_server.c (+2/-2) |
To merge this branch: | bzr merge lp:~xnox/partman-base/merge-debian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Pending | ||
Review via email: mp+328155@code.launchpad.net |
Commit message
Description of the change
I hope i got the merge of the grep pattern right.
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2016-08-12 13:24:29 +0000 | |||
3 | +++ debian/changelog 2017-07-27 07:25:19 +0000 | |||
4 | @@ -1,3 +1,87 @@ | |||
5 | 1 | partman-base (192ubuntu1) artful; urgency=medium | ||
6 | 2 | |||
7 | 3 | * Resynchronise with Debian. Remaining changes: | ||
8 | 4 | - Ubiquity integration: If PARTMAN_NO_COMMIT is set, then exit rather | ||
9 | 5 | than running commit.d and finish.d scripts; add a partman-commit | ||
10 | 6 | script; dump extra information to /var/lib/partman/snoop if | ||
11 | 7 | PARTMAN_SNOOP is set; check for per-menu 'no_show_choices' file in | ||
12 | 8 | ask_user and don't reshow the menu if it exists. | ||
13 | 9 | - Don't skip over dmraid devices if the user chooses not to activate | ||
14 | 10 | them. | ||
15 | 11 | - If the only thing mounted on a disk is the installation medium and it | ||
16 | 12 | uses more or less the whole disk, then silently exclude that disk; if | ||
17 | 13 | the installation medium is mounted but doesn't use the whole disk, | ||
18 | 14 | issue a warning that partitioning may be difficult; if anything else | ||
19 | 15 | is mounted, offer to unmount it. partman/filter_mounted=false disables | ||
20 | 16 | this. | ||
21 | 17 | - debian/control: replace harddrive-detection Depends with the specific | ||
22 | 18 | disk-detect version needed (>= 1.95ubuntu4) to support multipath-tools | ||
23 | 19 | 0.5.0. There are no other harddrive-detection providers yet anyway. | ||
24 | 20 | - Multipath support: | ||
25 | 21 | - lib/base.sh: is_multipath_part(): Use 'p' (not '-part') as multipath | ||
26 | 22 | disk-partition separator. | ||
27 | 23 | - lib/base.sh: humandev(): Accept spaces in multipath WWID. | ||
28 | 24 | - init.d/parted: part_of_multipath(): Update grep expression for more | ||
29 | 25 | recent output of 'multipath -l'. | ||
30 | 26 | - lib/base.sh: drop the p separator for multipath partitions | ||
31 | 27 | |||
32 | 28 | -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 27 Jul 2017 08:10:29 +0100 | ||
33 | 29 | |||
34 | 30 | partman-base (192) unstable; urgency=medium | ||
35 | 31 | |||
36 | 32 | [ Aurelien Jarno ] | ||
37 | 33 | * debian/isinstallable: drop support for unsupported mips platforms. | ||
38 | 34 | |||
39 | 35 | [ Karsten Merker ] | ||
40 | 36 | * For systems that are known to have their boot firmware on an mmcblk | ||
41 | 37 | device, protect the firmware area on all mmcblk devices (and not | ||
42 | 38 | only on mmcblk0) from being clobbered during guided partitioning | ||
43 | 39 | and add missing whitespace to the corresponding log output. | ||
44 | 40 | (Closes: #854822) | ||
45 | 41 | |||
46 | 42 | -- Cyril Brulebois <kibi@debian.org> Mon, 26 Jun 2017 00:11:48 +0200 | ||
47 | 43 | |||
48 | 44 | partman-base (191) unstable; urgency=medium | ||
49 | 45 | |||
50 | 46 | [ Mathieu Trudel-Lapierre ] | ||
51 | 47 | * init.d/parted: part_of_multipath(): Update grep expression for more | ||
52 | 48 | recent output of 'multipath -l'. | ||
53 | 49 | * lib/base.sh: humandev(): Accept spaces in multipath WWID. | ||
54 | 50 | |||
55 | 51 | [ Cyril Brulebois ] | ||
56 | 52 | * Merge Mathieu's work, with apologies for the delay. | ||
57 | 53 | |||
58 | 54 | -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2017 19:24:29 +0100 | ||
59 | 55 | |||
60 | 56 | partman-base (190) unstable; urgency=medium | ||
61 | 57 | |||
62 | 58 | [ Viktor Mihajlovski ] | ||
63 | 59 | * Add disk label type to device directory, such that | ||
64 | 60 | e.g. partman-partitioning can elect dasd partitioning table for dasd | ||
65 | 61 | drives. | ||
66 | 62 | |||
67 | 63 | [ Dimitri John Ledkov ] | ||
68 | 64 | * On s390[x], prevent using extended partitions on DASD drives that can | ||
69 | 65 | only hold 3 partitions. Parted doesn't have special knowledge about | ||
70 | 66 | that and claims that msdos partition table on DASD drives can hold | ||
71 | 67 | the usual maximum number of partitions types. | ||
72 | 68 | |||
73 | 69 | -- Christian Perrier <bubulle@debian.org> Sun, 13 Nov 2016 07:45:31 +0100 | ||
74 | 70 | |||
75 | 71 | partman-base (189) unstable; urgency=medium | ||
76 | 72 | |||
77 | 73 | [ Colin Watson ] | ||
78 | 74 | * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. | ||
79 | 75 | |||
80 | 76 | -- Christian Perrier <bubulle@debian.org> Sun, 07 Feb 2016 17:01:43 +0100 | ||
81 | 77 | |||
82 | 78 | partman-base (188) unstable; urgency=medium | ||
83 | 79 | |||
84 | 80 | [ Updated translations ] | ||
85 | 81 | * Thai (th.po) by Theppitak Karoonboonyanan | ||
86 | 82 | |||
87 | 83 | -- Christian Perrier <bubulle@debian.org> Fri, 02 Oct 2015 12:31:01 +0200 | ||
88 | 84 | |||
89 | 1 | partman-base (187ubuntu3) yakkety; urgency=medium | 85 | partman-base (187ubuntu3) yakkety; urgency=medium |
90 | 2 | 86 | ||
91 | 3 | * On s390[x], Prevent using extended partitions on DASD drives that can | 87 | * On s390[x], Prevent using extended partitions on DASD drives that can |
92 | @@ -5194,4 +5278,3 @@ | |||
93 | 5194 | * First version. | 5278 | * First version. |
94 | 5195 | 5279 | ||
95 | 5196 | -- Anton Zinoviev <zinoviev@debian.org> Wed, 27 Aug 2003 07:03:28 +0200 | 5280 | -- Anton Zinoviev <zinoviev@debian.org> Wed, 27 Aug 2003 07:03:28 +0200 |
96 | 5197 | |||
97 | 5198 | 5281 | ||
98 | === modified file 'debian/control' | |||
99 | --- debian/control 2015-07-06 15:42:51 +0000 | |||
100 | +++ debian/control 2017-07-27 07:25:19 +0000 | |||
101 | @@ -5,8 +5,8 @@ | |||
102 | 5 | XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org> | 5 | XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org> |
103 | 6 | Uploaders: Anton Zinoviev <zinoviev@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Max Vozeler <xam@debian.org> | 6 | Uploaders: Anton Zinoviev <zinoviev@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Max Vozeler <xam@debian.org> |
104 | 7 | Build-Depends: debhelper (>= 9), dh-autoreconf, dh-di (>= 2), pkg-config, po-debconf (>= 0.5.0), libparted-dev (>= 2.2) | 7 | Build-Depends: debhelper (>= 9), dh-autoreconf, dh-di (>= 2), pkg-config, po-debconf (>= 0.5.0), libparted-dev (>= 2.2) |
107 | 8 | XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-base.git | 8 | XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/partman-base.git |
108 | 9 | XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/partman-base.git | 9 | XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/partman-base.git |
109 | 10 | Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-base/ubuntu | 10 | Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-base/ubuntu |
110 | 11 | 11 | ||
111 | 12 | Package: partman-base | 12 | Package: partman-base |
112 | 13 | 13 | ||
113 | === modified file 'debian/isinstallable' | |||
114 | --- debian/isinstallable 2008-01-04 19:01:22 +0000 | |||
115 | +++ debian/isinstallable 2017-07-27 07:25:19 +0000 | |||
116 | @@ -1,16 +1,6 @@ | |||
117 | 1 | #!/bin/sh | 1 | #!/bin/sh |
118 | 2 | 2 | ||
119 | 3 | case "`archdetect`" in | 3 | case "`archdetect`" in |
120 | 4 | # parted does not properly edit dvh disk labels | ||
121 | 5 | mips/r4k-ip22 | mips/r5k-ip22 | mips/r8k-ip26 | mips/r10k-ip28) | ||
122 | 6 | return 1 | ||
123 | 7 | ;; | ||
124 | 8 | mips/r10k-ip27 | mips/r12k-ip27) | ||
125 | 9 | return 1 | ||
126 | 10 | ;; | ||
127 | 11 | mips/r5k-ip32 | mips/r10k-ip32 | mips/r12k-ip32) | ||
128 | 12 | return 1 | ||
129 | 13 | ;; | ||
130 | 14 | *) | 4 | *) |
131 | 15 | return 0; | 5 | return 0; |
132 | 16 | esac | 6 | esac |
133 | 17 | 7 | ||
134 | === modified file 'debian/po/be.po' | |||
135 | --- debian/po/be.po 2016-08-12 13:19:11 +0000 | |||
136 | +++ debian/po/be.po 2017-07-27 07:25:19 +0000 | |||
137 | @@ -23,9 +23,10 @@ | |||
138 | 23 | "Project-Id-Version: be\n" | 23 | "Project-Id-Version: be\n" |
139 | 24 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" | 24 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" |
140 | 25 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" | 25 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" |
144 | 26 | "PO-Revision-Date: 2012-01-18 01:58+0300\n" | 26 | "PO-Revision-Date: 2015-12-21 15:13+0300\n" |
145 | 27 | "Last-Translator: Viktar Siarheichyk <vics@eq.by>\n" | 27 | "Last-Translator: Viktar Siarheichyk <vics@fsfe.org>\n" |
146 | 28 | "Language-Team: Belarusian <i18n@mova.org>\n" | 28 | "Language-Team: Debian l10n team for Belarusian <debian-l10n-belarusian@lists." |
147 | 29 | "debian.org>\n" | ||
148 | 29 | "Language: be\n" | 30 | "Language: be\n" |
149 | 30 | "MIME-Version: 1.0\n" | 31 | "MIME-Version: 1.0\n" |
150 | 31 | "Content-Type: text/plain; charset=UTF-8\n" | 32 | "Content-Type: text/plain; charset=UTF-8\n" |
151 | 32 | 33 | ||
152 | === modified file 'debian/po/da.po' | |||
153 | --- debian/po/da.po 2016-08-12 13:19:11 +0000 | |||
154 | +++ debian/po/da.po 2017-07-27 07:25:19 +0000 | |||
155 | @@ -39,7 +39,7 @@ | |||
156 | 39 | "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n" | 39 | "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n" |
157 | 40 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" | 40 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" |
158 | 41 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" | 41 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" |
160 | 42 | "PO-Revision-Date: 2015-03-05 20:12+0200\n" | 42 | "PO-Revision-Date: 2015-08-16 20:20+0200\n" |
161 | 43 | "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" | 43 | "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" |
162 | 44 | "Language-Team: <dansk@dansk-gruppen.dk>\n" | 44 | "Language-Team: <dansk@dansk-gruppen.dk>\n" |
163 | 45 | "Language: da\n" | 45 | "Language: da\n" |
164 | 46 | 46 | ||
165 | === modified file 'debian/po/th.po' | |||
166 | --- debian/po/th.po 2011-09-08 17:47:18 +0000 | |||
167 | +++ debian/po/th.po 2017-07-27 07:25:19 +0000 | |||
168 | @@ -4,9 +4,9 @@ | |||
169 | 4 | # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST | 4 | # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST |
170 | 5 | # | 5 | # |
171 | 6 | # Thai translation of debian-installer. | 6 | # Thai translation of debian-installer. |
173 | 7 | # Copyright (C) 2006-2011 Software in the Public Interest, Inc. | 7 | # Copyright (C) 2006-2015 Software in the Public Interest, Inc. |
174 | 8 | # This file is distributed under the same license as debian-installer. | 8 | # This file is distributed under the same license as debian-installer. |
176 | 9 | # Theppitak Karoonboonyanan <thep@linux.thai.net>, 2006-2011. | 9 | # Theppitak Karoonboonyanan <theppitak@gmail.com>, 2006-2015. |
177 | 10 | # | 10 | # |
178 | 11 | # | 11 | # |
179 | 12 | # Translations from iso-codes: | 12 | # Translations from iso-codes: |
180 | @@ -14,18 +14,17 @@ | |||
181 | 14 | # Translations taken from ICU SVN on 2007-09-09 | 14 | # Translations taken from ICU SVN on 2007-09-09 |
182 | 15 | # Free Software Foundation, Inc., 2002,2003,2004 | 15 | # Free Software Foundation, Inc., 2002,2003,2004 |
183 | 16 | # Alastair McKinstry <mckinstry@computer.org>, 2002, 2004 | 16 | # Alastair McKinstry <mckinstry@computer.org>, 2002, 2004 |
188 | 17 | # Translations from KDE: | 17 | # Translations from KDE: |
189 | 18 | # - Thanomsub Noppaburana <donga@midaassets.com> | 18 | # Thanomsub Noppaburana <donga@midaassets.com> |
190 | 19 | # Thanomsub Noppaburana <donga@midaassets.com> (Translations from KDE) | 19 | # Theppitak Karoonboonyanan <theppitak@gmail.com>, 2005-2015 |
187 | 20 | # Theppitak Karoonboonyanan <thep@linux.thai.net>, 2005-2011 | ||
191 | 21 | # | 20 | # |
192 | 22 | msgid "" | 21 | msgid "" |
193 | 23 | msgstr "" | 22 | msgstr "" |
194 | 24 | "Project-Id-Version: debian-installer\n" | 23 | "Project-Id-Version: debian-installer\n" |
195 | 25 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" | 24 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" |
196 | 26 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" | 25 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" |
199 | 27 | "PO-Revision-Date: 2011-08-17 22:42+0700\n" | 26 | "PO-Revision-Date: 2015-09-30 14:14+0700\n" |
200 | 28 | "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" | 27 | "Last-Translator: Theppitak Karoonboonyanan <theppitak@gmail.com>\n" |
201 | 29 | "Language-Team: Thai <thai-l10n@googlegroups.com>\n" | 28 | "Language-Team: Thai <thai-l10n@googlegroups.com>\n" |
202 | 30 | "Language: th\n" | 29 | "Language: th\n" |
203 | 31 | "MIME-Version: 1.0\n" | 30 | "MIME-Version: 1.0\n" |
204 | @@ -160,7 +159,7 @@ | |||
205 | 160 | "If you continue, the changes listed below will be written to the disks. " | 159 | "If you continue, the changes listed below will be written to the disks. " |
206 | 161 | "Otherwise, you will be able to make further changes manually." | 160 | "Otherwise, you will be able to make further changes manually." |
207 | 162 | msgstr "" | 161 | msgstr "" |
209 | 163 | "หากคุณดำเนินการต่อ การเปลี่ยนแปลงในรายการข้างล่างจะถูกเขียนลงดิสก์ มิฉะนั้น " | 162 | "หากคุณดำเนินการต่อ การเปลี่ยนแปลงในรายการข้างล่างนี้จะถูกเขียนลงดิสก์ หรือไม่เช่นนั้น " |
210 | 164 | "คุณก็ยังสามารถเปลี่ยนแปลงสิ่งต่างๆ เองเพิ่มเติมได้อีก" | 163 | "คุณก็ยังสามารถเปลี่ยนแปลงสิ่งต่างๆ เองเพิ่มเติมได้อีก" |
211 | 165 | 164 | ||
212 | 166 | #. Type: boolean | 165 | #. Type: boolean |
213 | 167 | 166 | ||
214 | === modified file 'debian/po/zh_CN.po' | |||
215 | --- debian/po/zh_CN.po 2015-03-08 09:35:34 +0000 | |||
216 | +++ debian/po/zh_CN.po 2017-07-27 07:25:19 +0000 | |||
217 | @@ -26,16 +26,17 @@ | |||
218 | 26 | # YunQiang Su <wzssyqa@gmail.com>, 2011. | 26 | # YunQiang Su <wzssyqa@gmail.com>, 2011. |
219 | 27 | # | 27 | # |
220 | 28 | # Mai Hao Hui <mhh@126.com>, 2001 (translations from galeon) | 28 | # Mai Hao Hui <mhh@126.com>, 2001 (translations from galeon) |
222 | 29 | # YunQiang Su <wzssyqa@gmail.com>, 2010, 2011. | 29 | # YunQiang Su <wzssyqa@gmail.com>, 2010, 2011, 2012, 2013. |
223 | 30 | # Yangfl <mmyangfl@gmail.com>, 2017. | ||
224 | 30 | # | 31 | # |
225 | 31 | msgid "" | 32 | msgid "" |
226 | 32 | msgstr "" | 33 | msgstr "" |
227 | 33 | "Project-Id-Version: debian-installer\n" | 34 | "Project-Id-Version: debian-installer\n" |
228 | 34 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" | 35 | "Report-Msgid-Bugs-To: partman-base@packages.debian.org\n" |
229 | 35 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" | 36 | "POT-Creation-Date: 2011-07-27 22:47+0000\n" |
233 | 36 | "PO-Revision-Date: 2011-08-11 11:13+0800\n" | 37 | "PO-Revision-Date: 2017-06-11 18:20+0800\n" |
234 | 37 | "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n" | 38 | "Last-Translator: Yangfl <mmyangfl@gmail.com>\n" |
235 | 38 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" | 39 | "Language-Team: <debian-l10n-chinese@lists.debian.org>\n" |
236 | 39 | "Language: zh_CN\n" | 40 | "Language: zh_CN\n" |
237 | 40 | "MIME-Version: 1.0\n" | 41 | "MIME-Version: 1.0\n" |
238 | 41 | "Content-Type: text/plain; charset=UTF-8\n" | 42 | "Content-Type: text/plain; charset=UTF-8\n" |
239 | @@ -47,7 +48,7 @@ | |||
240 | 47 | #. :sl1: | 48 | #. :sl1: |
241 | 48 | #: ../partman-base.templates:1001 | 49 | #: ../partman-base.templates:1001 |
242 | 49 | msgid "Starting up the partitioner" | 50 | msgid "Starting up the partitioner" |
244 | 50 | msgstr "正在启动 partitioner" | 51 | msgstr "正在启动分区程序" |
245 | 51 | 52 | ||
246 | 52 | #. Type: text | 53 | #. Type: text |
247 | 53 | #. Description | 54 | #. Description |
248 | @@ -170,8 +171,8 @@ | |||
249 | 170 | "If you continue, the changes listed below will be written to the disks. " | 171 | "If you continue, the changes listed below will be written to the disks. " |
250 | 171 | "Otherwise, you will be able to make further changes manually." | 172 | "Otherwise, you will be able to make further changes manually." |
251 | 172 | msgstr "" | 173 | msgstr "" |
254 | 173 | "如果您继续,以下所列出的修改内容将被写入磁盘。否则您将可以进行进一步的手动修" | 174 | "如果您继续,以下所列出的修改内容将会写入到磁盘中。或者,您也可以手动来进行其" |
255 | 174 | "改。" | 175 | "它修改。" |
256 | 175 | 176 | ||
257 | 176 | #. Type: boolean | 177 | #. Type: boolean |
258 | 177 | #. Description | 178 | #. Description |
259 | @@ -180,7 +181,7 @@ | |||
260 | 180 | msgid "" | 181 | msgid "" |
261 | 181 | "WARNING: This will destroy all data on any partitions you have removed as " | 182 | "WARNING: This will destroy all data on any partitions you have removed as " |
262 | 182 | "well as on the partitions that are going to be formatted." | 183 | "well as on the partitions that are going to be formatted." |
264 | 183 | msgstr "警告:任何已被删除的和将要被格式化的分区上的数据都将被摧毁。" | 184 | msgstr "警告:任何已删除和将要格式化的分区上的数据都将被摧毁。" |
265 | 184 | 185 | ||
266 | 185 | #. Type: text | 186 | #. Type: text |
267 | 186 | #. Description | 187 | #. Description |
268 | @@ -195,7 +196,7 @@ | |||
269 | 195 | #. for example: "partition #6 of IDE0 master as ext3 journaling file system" | 196 | #. for example: "partition #6 of IDE0 master as ext3 journaling file system" |
270 | 196 | #: ../partman-base.templates:14001 | 197 | #: ../partman-base.templates:14001 |
271 | 197 | msgid "partition #${PARTITION} of ${DEVICE} as ${TYPE}" | 198 | msgid "partition #${PARTITION} of ${DEVICE} as ${TYPE}" |
273 | 198 | msgstr "${DEVICE} 设备上的第 ${PARTITION} 分区将被设置为 ${TYPE}" | 199 | msgstr "${DEVICE} 设备上的第 ${PARTITION} 分区将设为 ${TYPE}" |
274 | 199 | 200 | ||
275 | 200 | #. Type: text | 201 | #. Type: text |
276 | 201 | #. Description | 202 | #. Description |
277 | @@ -204,14 +205,14 @@ | |||
278 | 204 | #. for example: "LVM VG Debian, LV Root as ext3 journaling file system" | 205 | #. for example: "LVM VG Debian, LV Root as ext3 journaling file system" |
279 | 205 | #: ../partman-base.templates:15001 | 206 | #: ../partman-base.templates:15001 |
280 | 206 | msgid "${DEVICE} as ${TYPE}" | 207 | msgid "${DEVICE} as ${TYPE}" |
282 | 207 | msgstr "${DEVICE} 设备将被设置为 ${TYPE}" | 208 | msgstr "${DEVICE} 设备将设为 ${TYPE}" |
283 | 208 | 209 | ||
284 | 209 | #. Type: text | 210 | #. Type: text |
285 | 210 | #. Description | 211 | #. Description |
286 | 211 | #. :sl2: | 212 | #. :sl2: |
287 | 212 | #: ../partman-base.templates:16001 | 213 | #: ../partman-base.templates:16001 |
288 | 213 | msgid "The partition tables of the following devices are changed:" | 214 | msgid "The partition tables of the following devices are changed:" |
290 | 214 | msgstr "以下设备的分区表已被改变:" | 215 | msgstr "以下设备的分区表已改变:" |
291 | 215 | 216 | ||
292 | 216 | #. Type: select | 217 | #. Type: select |
293 | 217 | #. Description | 218 | #. Description |
294 | @@ -242,35 +243,35 @@ | |||
295 | 242 | "You are editing partition #${PARTITION} of ${DEVICE}. ${OTHERINFO} " | 243 | "You are editing partition #${PARTITION} of ${DEVICE}. ${OTHERINFO} " |
296 | 243 | "${DESTROYED}" | 244 | "${DESTROYED}" |
297 | 244 | msgstr "" | 245 | msgstr "" |
299 | 245 | "您正在编辑 ${DEVICE} 设备上的第 ${PARTITION} 分区。${OTHERINFO}${DESTROYED}" | 246 | "您正在编辑 ${DEVICE} 设备上的第 ${PARTITION} 分区。${OTHERINFO} ${DESTROYED}" |
300 | 246 | 247 | ||
301 | 247 | #. Type: text | 248 | #. Type: text |
302 | 248 | #. Description | 249 | #. Description |
303 | 249 | #. :sl2: | 250 | #. :sl2: |
304 | 250 | #: ../partman-base.templates:20001 | 251 | #: ../partman-base.templates:20001 |
305 | 251 | msgid "This partition is formatted with the ${FILESYSTEM}." | 252 | msgid "This partition is formatted with the ${FILESYSTEM}." |
307 | 252 | msgstr "此分区被格式化为 ${FILESYSTEM}。" | 253 | msgstr "此分区已格式化为 ${FILESYSTEM}。" |
308 | 253 | 254 | ||
309 | 254 | #. Type: text | 255 | #. Type: text |
310 | 255 | #. Description | 256 | #. Description |
311 | 256 | #. :sl2: | 257 | #. :sl2: |
312 | 257 | #: ../partman-base.templates:21001 | 258 | #: ../partman-base.templates:21001 |
313 | 258 | msgid "No existing file system was detected in this partition." | 259 | msgid "No existing file system was detected in this partition." |
315 | 259 | msgstr "未在此分区上发现已存在的文件系统。" | 260 | msgstr "未在此分区上发现任何已存在的文件系统。" |
316 | 260 | 261 | ||
317 | 261 | #. Type: text | 262 | #. Type: text |
318 | 262 | #. Description | 263 | #. Description |
319 | 263 | #. :sl2: | 264 | #. :sl2: |
320 | 264 | #: ../partman-base.templates:22001 | 265 | #: ../partman-base.templates:22001 |
321 | 265 | msgid "All data in it WILL BE DESTROYED!" | 266 | msgid "All data in it WILL BE DESTROYED!" |
323 | 266 | msgstr "其中的所有数据都将被摧毁!" | 267 | msgstr "其中的所有数据都将被 [完 全 摧 毁]!" |
324 | 267 | 268 | ||
325 | 268 | #. Type: note | 269 | #. Type: note |
326 | 269 | #. Description | 270 | #. Description |
327 | 270 | #. :sl2: | 271 | #. :sl2: |
328 | 271 | #: ../partman-base.templates:23001 | 272 | #: ../partman-base.templates:23001 |
329 | 272 | msgid "The partition starts from ${FROMCHS} and ends at ${TOCHS}." | 273 | msgid "The partition starts from ${FROMCHS} and ends at ${TOCHS}." |
331 | 273 | msgstr "此分区开始于 ${FROMCHS} 结束于 ${TOCHS} 。" | 274 | msgstr "此分区开始于 ${FROMCHS} 结束于 ${TOCHS}。" |
332 | 274 | 275 | ||
333 | 275 | #. Type: note | 276 | #. Type: note |
334 | 276 | #. Description | 277 | #. Description |
335 | @@ -284,14 +285,14 @@ | |||
336 | 284 | #. :sl1: | 285 | #. :sl1: |
337 | 285 | #: ../partman-base.templates:26001 | 286 | #: ../partman-base.templates:26001 |
338 | 286 | msgid "Partitions formatting" | 287 | msgid "Partitions formatting" |
340 | 287 | msgstr "分区格式化" | 288 | msgstr "正在格式化分区" |
341 | 288 | 289 | ||
342 | 289 | #. Type: text | 290 | #. Type: text |
343 | 290 | #. Description | 291 | #. Description |
344 | 291 | #. :sl1: | 292 | #. :sl1: |
345 | 292 | #: ../partman-base.templates:27001 | 293 | #: ../partman-base.templates:27001 |
346 | 293 | msgid "Processing..." | 294 | msgid "Processing..." |
348 | 294 | msgstr "执行中..." | 295 | msgstr "处理中..." |
349 | 295 | 296 | ||
350 | 296 | #. Type: text | 297 | #. Type: text |
351 | 297 | #. Description | 298 | #. Description |
352 | @@ -315,7 +316,7 @@ | |||
353 | 315 | #. :sl1: | 316 | #. :sl1: |
354 | 316 | #: ../partman-base.templates:31001 | 317 | #: ../partman-base.templates:31001 |
355 | 317 | msgid "Finish partitioning and write changes to disk" | 318 | msgid "Finish partitioning and write changes to disk" |
357 | 318 | msgstr "分区设定结束并将修改写入磁盘" | 319 | msgstr "结束分区设定并将修改写入磁盘" |
358 | 319 | 320 | ||
359 | 320 | #. Type: text | 321 | #. Type: text |
360 | 321 | #. Description | 322 | #. Description |
361 | @@ -354,7 +355,7 @@ | |||
362 | 354 | #. :sl1: | 355 | #. :sl1: |
363 | 355 | #: ../partman-base.templates:37001 | 356 | #: ../partman-base.templates:37001 |
364 | 356 | msgid "primary" | 357 | msgid "primary" |
366 | 357 | msgstr "主分区" | 358 | msgstr "主" |
367 | 358 | 359 | ||
368 | 359 | #. Type: text | 360 | #. Type: text |
369 | 360 | #. Description | 361 | #. Description |
370 | @@ -362,7 +363,7 @@ | |||
371 | 362 | #. :sl1: | 363 | #. :sl1: |
372 | 363 | #: ../partman-base.templates:38001 | 364 | #: ../partman-base.templates:38001 |
373 | 364 | msgid "logical" | 365 | msgid "logical" |
375 | 365 | msgstr "逻辑分区" | 366 | msgstr "逻辑" |
376 | 366 | 367 | ||
377 | 367 | #. Type: text | 368 | #. Type: text |
378 | 368 | #. Description | 369 | #. Description |
379 | @@ -540,7 +541,7 @@ | |||
380 | 540 | #: ../partman-base.templates:57001 | 541 | #: ../partman-base.templates:57001 |
381 | 541 | #, no-c-format | 542 | #, no-c-format |
382 | 542 | msgid "Multipath %s (WWID %s)" | 543 | msgid "Multipath %s (WWID %s)" |
384 | 543 | msgstr "多重路径(Multipath) %s (通用ID(WWID) %s)" | 544 | msgstr "多重路径 (Multipath) %s (WWID %s)" |
385 | 544 | 545 | ||
386 | 545 | #. Type: text | 546 | #. Type: text |
387 | 546 | #. Description | 547 | #. Description |
388 | @@ -548,7 +549,7 @@ | |||
389 | 548 | #: ../partman-base.templates:58001 | 549 | #: ../partman-base.templates:58001 |
390 | 549 | #, no-c-format | 550 | #, no-c-format |
391 | 550 | msgid "Multipath %s (partition #%s)" | 551 | msgid "Multipath %s (partition #%s)" |
393 | 551 | msgstr "多重路径(Multipath) %s (第 #%s 分区)" | 552 | msgstr "多重路径 (Multipath) %s (第 #%s 分区)" |
394 | 552 | 553 | ||
395 | 553 | #. Type: text | 554 | #. Type: text |
396 | 554 | #. Description | 555 | #. Description |
397 | @@ -564,7 +565,7 @@ | |||
398 | 564 | #: ../partman-base.templates:60001 | 565 | #: ../partman-base.templates:60001 |
399 | 565 | #, no-c-format | 566 | #, no-c-format |
400 | 566 | msgid "ZFS pool %s, volume %s" | 567 | msgid "ZFS pool %s, volume %s" |
402 | 567 | msgstr "ZFS pool %s, 卷 %s" | 568 | msgstr "ZFS 池 %s,卷 %s" |
403 | 568 | 569 | ||
404 | 569 | #. Type: text | 570 | #. Type: text |
405 | 570 | #. Description | 571 | #. Description |
406 | 571 | 572 | ||
407 | === modified file 'init.d/parted' | |||
408 | --- init.d/parted 2016-08-12 13:19:46 +0000 | |||
409 | +++ init.d/parted 2017-07-27 07:25:19 +0000 | |||
410 | @@ -49,10 +49,8 @@ | |||
411 | 49 | # The block devices that make up the multipath: | 49 | # The block devices that make up the multipath: |
412 | 50 | # Output looks like "(decoration-symbols) 4:0:0:1 sdc 8:32 ..." | 50 | # Output looks like "(decoration-symbols) 4:0:0:1 sdc 8:32 ..." |
413 | 51 | # (decoration-symbols are not matched; they may change again, and the spaces differ for last device) | 51 | # (decoration-symbols are not matched; they may change again, and the spaces differ for last device) |
414 | 52 | # (there is 1 or more spaces between fields if any disk has 4 letters; e.g., sdaa) | ||
415 | 53 | for mpdev in $(multipath -l | \ | 52 | for mpdev in $(multipath -l | \ |
418 | 54 | grep -o '\([#0-9]\+:\)\{3\}[#0-9]\+ \+[hs]d[a-z]\+ \+[0-9]\+:[0-9]\+' | \ | 53 | grep -o '\([#0-9]\+:\)\{3\}[#0-9]\+ [hs]d[a-z]\+ [0-9]\+:[0-9]\+' | \ |
417 | 55 | sed 's/ / /' | \ | ||
419 | 56 | cut -f2 -d' '); do | 54 | cut -f2 -d' '); do |
420 | 57 | if [ "$(readlink -f /dev/$mpdev)" = $1 ]; then | 55 | if [ "$(readlink -f /dev/$mpdev)" = $1 ]; then |
421 | 58 | return 0 | 56 | return 0 |
422 | 59 | 57 | ||
423 | === modified file 'parted_server.c' | |||
424 | --- parted_server.c 2016-08-12 13:24:29 +0000 | |||
425 | +++ parted_server.c 2017-07-27 07:25:19 +0000 | |||
426 | @@ -1374,9 +1374,9 @@ | |||
427 | 1374 | * the firmware area, resulting in an unbootable system (see | 1374 | * the firmware area, resulting in an unbootable system (see |
428 | 1375 | * bug #751704). | 1375 | * bug #751704). |
429 | 1376 | */ | 1376 | */ |
431 | 1377 | if (is_system_with_firmware_on_disk() && !strcmp(disk->dev->path, "/dev/mmcblk0")) { | 1377 | if (is_system_with_firmware_on_disk() && !strncmp(disk->dev->path, "/dev/mmcblk", 11)) { |
432 | 1378 | disk->needs_clobber = 0; | 1378 | disk->needs_clobber = 0; |
434 | 1379 | log("Sunxi/Freescale/AM33XX detected. Disabling ped_disk_clobber" \ | 1379 | log("Sunxi/Freescale/AM33XX detected. Disabling ped_disk_clobber " \ |
435 | 1380 | "for the boot device %s to protect the firmware " \ | 1380 | "for the boot device %s to protect the firmware " \ |
436 | 1381 | "area.", disk->dev->path); | 1381 | "area.", disk->dev->path); |
437 | 1382 | } | 1382 | } |
I guess this is for 18.04 now