Merge lp:~fourdollars/ubuntu/wily/partman-efi/1512589 into lp:ubuntu/wily/partman-efi

Proposed by Shih-Yuan Lee on 2015-11-03
Status: Approved
Approved by: Mathieu Trudel-Lapierre on 2016-01-15
Approved revision: 31
Proposed branch: lp:~fourdollars/ubuntu/wily/partman-efi/1512589
Merge into: lp:ubuntu/wily/partman-efi
Diff against target: 70 lines (+39/-4)
2 files modified
debian/changelog (+6/-0)
fstab.d/efi (+33/-4)
To merge this branch: bzr merge lp:~fourdollars/ubuntu/wily/partman-efi/1512589
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-11-03 Approve on 2015-11-27
Review via email: mp+276496@code.launchpad.net
To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks fine. The same code is already in xenial now; I will give it some more testing and do the uploads to SRUs.

review: Approve

Unmerged revisions

31. By Shih-Yuan Lee on 2015-11-03

Follow partman-auto/disk to reuse the ESP. (LP: #1512589)

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 2015-04-15 17:53:39 +0000
3+++ debian/changelog 2015-11-03 07:09:56 +0000
4@@ -1,3 +1,9 @@
5+partman-efi (62ubuntu2.1) wily-proposed; urgency=medium
6+
7+ * Follow partman-auto/disk to reuse the ESP. (LP: #1512589)
8+
9+ -- Shih-Yuan Lee (FourDollars) <sylee@canonical.com> Tue, 03 Nov 2015 14:51:37 +0800
10+
11 partman-efi (62ubuntu2) vivid; urgency=medium
12
13 * Honor preseeding of partman-efi/non_efi_system (and/or don't ask for it
14
15=== modified file 'fstab.d/efi'
16--- fstab.d/efi 2015-02-02 19:01:37 +0000
17+++ fstab.d/efi 2015-11-03 07:09:56 +0000
18@@ -12,19 +12,48 @@
19 ;;
20 esac
21
22-seen_efi=
23+paths=
24 for dev in $DEVICES/*; do
25 [ -d $dev ] || continue
26 cd $dev
27 open_dialog PARTITIONS
28 while { read_line num id size type fs path name; [ "$id" ]; }; do
29- [ -z "$seen_efi" ] || continue
30 [ $fs != free ] || continue
31 [ -f "$id/method" ] || continue
32 method=$(cat $id/method)
33 [ "$method" = efi ] || continue
34- echo "$path" /boot/efi vfat umask=0077 0 1
35- seen_efi=1
36+ if [ -z "$paths" ]; then
37+ paths="$path"
38+ else
39+ paths="$paths $path"
40+ fi
41 done
42 close_dialog
43 done
44+
45+if [ -z "$paths" ]; then
46+ exit 0
47+fi
48+
49+# Use any autopartition disk that has been set
50+if db_get partman-auto/disk && [ "$RET" ]; then
51+ disks="$RET"
52+ seen_efi=
53+ for disk in $disks; do
54+ for path in $paths; do
55+ case "$path" in
56+ $disk*)
57+ echo "$path" /boot/efi vfat umask=0077 0 1
58+ seen_efi=1
59+ break
60+ ;;
61+ esac
62+ done
63+ [ -z "$seen_efi" ] || break
64+ done
65+else
66+ for path in $paths; do
67+ echo "$path" /boot/efi vfat umask=0077 0 1
68+ break
69+ done
70+fi

Subscribers

People subscribed via source and target branches

to all changes: