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