Fix $iflabel{ } logic to avoid including the partition anyway if the
current directory is not a subdirectory of /var/lib/partman/devices.
This caused automatic LVM partitioning to be calculated with a biosgrub
partition regardless of the disk label type, although as it happened
this cancelled out with another bug so that partition would never
actually be written to disk (LP: #538536).
r62653
Colin Watson
14 years ago
|
0 |
partman-auto (91) UNRELEASED; urgency=low
|
|
1 |
|
|
2 |
* Fix $iflabel{ } logic to avoid including the partition anyway if the
|
|
3 |
current directory is not a subdirectory of /var/lib/partman/devices.
|
|
4 |
This caused automatic LVM partitioning to be calculated with a biosgrub
|
|
5 |
partition regardless of the disk label type, although as it happened
|
|
6 |
this cancelled out with another bug so that partition would never
|
|
7 |
actually be written to disk (LP: #538536).
|
|
8 |
|
|
9 |
-- Colin Watson <[email protected]> Mon, 15 Mar 2010 10:18:23 +0000
|
|
10 |
|
| 0 | 11 |
partman-auto (90) unstable; urgency=low
|
| 1 | 12 |
|
| 2 | 13 |
[ Colin Watson ]
|
| 119 | 119 |
# now, $iflabel will not work when doing automatic
|
| 120 | 120 |
# LVM partitioning.
|
| 121 | 121 |
iflabel="$(echo $line | sed -n 's/.*\$iflabel{ \([^}]*\) }.*/\1/p')"
|
| 122 | |
if [ "$iflabel" ] && [ "${PWD#$DEVICES/}" != "$PWD" ]; then
|
| 123 | |
open_dialog GET_LABEL_TYPE
|
| 124 | |
read_line label
|
| 125 | |
close_dialog
|
| 126 | |
if [ "$iflabel" = "$label" ]; then
|
| 127 | |
scheme="${scheme:+$scheme$NL}$line"
|
|
122 |
if [ "$iflabel" ]; then
|
|
123 |
if [ "${PWD#$DEVICES/}" != "$PWD" ]; then
|
|
124 |
open_dialog GET_LABEL_TYPE
|
|
125 |
read_line label
|
|
126 |
close_dialog
|
|
127 |
if [ "$iflabel" = "$label" ]; then
|
|
128 |
scheme="${scheme:+$scheme$NL}$line"
|
|
129 |
fi
|
| 128 | 130 |
fi
|
| 129 | 131 |
else
|
| 130 | 132 |
scheme="${scheme:+$scheme$NL}$line"
|