Merge lp://staging/~xnox/partman-auto/avoid-hung-blkid into lp://staging/~ubuntu-core-dev/partman-auto/ubuntu
Proposed by
Dimitri John Ledkov
| Status: | Merged |
|---|---|
| Merged at revision: | 646 |
| Proposed branch: | lp://staging/~xnox/partman-auto/avoid-hung-blkid |
| Merge into: | lp://staging/~ubuntu-core-dev/partman-auto/ubuntu |
| Diff against target: |
75 lines (+20/-8) 3 files modified
automatically_partition/replace/choices (+3/-4) automatically_partition/reuse/choices (+3/-4) debian/changelog (+14/-0) |
| To merge this branch: | bzr merge lp://staging/~xnox/partman-auto/avoid-hung-blkid |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) wrote | # |
Revision history for this message
| Dimitri John Ledkov (xnox) wrote | # |
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
On Wed, Dec 12, 2012 at 11:56:27AM -0000, Dmitrijs Ledkovs wrote:
> - [ "$fs" != free ] || continue
> + [ ! $(echo "$fs" | grep -s -e free -e fat -e ntfs -e hfs+ -e linux-swap) ] || continue
This is dangerously underquoted around the $(...), and I think I would
suggest using egrep -s 'foo|bar|baz' rather than grep -s -e foo -e bar
-e baz ... it's just a bit more standard in d-i code. (And, in that
case, be careful to escape the + in hfs+.)
> + - Skip mounting filesystems that ought to not be Ubuntu root
> + filesystems (empty, swap, fat, ntfs, hfs). This also should speed up
> + automatic partitioning page.
hfs and hfs+ are different filesystems, and at the moment you only
exclude hfs+.
Any reason not to exclude hfs and hfsx as well?