diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-05-14 14:29:53 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-05-14 14:29:53 +0000 |
| commit | e6ee78531a475cbbd55f152b1e16e4a4fee6b576 (patch) | |
| tree | c36e881b8e2c1f95982a08189ea690fa5219ae74 | |
| parent | bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1 (diff) | |
| download | drakx-e6ee78531a475cbbd55f152b1e16e4a4fee6b576.tar drakx-e6ee78531a475cbbd55f152b1e16e4a4fee6b576.tar.gz drakx-e6ee78531a475cbbd55f152b1e16e4a4fee6b576.tar.bz2 drakx-e6ee78531a475cbbd55f152b1e16e4a4fee6b576.tar.xz drakx-e6ee78531a475cbbd55f152b1e16e4a4fee6b576.zip | |
match partitions when one of them as device_alias to the device of the other one
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/get.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 203d08104..11ffebdee 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - diskdrake: disbale encryption option for /boot +- match partitions when one of them as device_alias to the device of the other one Version 13.51 - 12 May 2011 diff --git a/perl-install/fs/get.pm b/perl-install/fs/get.pm index 8e49e91fa..461984431 100644 --- a/perl-install/fs/get.pm +++ b/perl-install/fs/get.pm @@ -144,7 +144,10 @@ sub is_same_hd { } else { $hd1->{device_LABEL} && $hd2->{device_LABEL} && $hd1->{device_LABEL} eq $hd2->{device_LABEL} || $hd1->{device_UUID} && $hd2->{device_UUID} && $hd1->{device_UUID} eq $hd2->{device_UUID} - || $hd1->{device} && $hd2->{device} && $hd1->{device} eq $hd2->{device}; + || $hd1->{device} && $hd2->{device} && $hd1->{device} eq $hd2->{device} + || $hd1->{device} && $hd2->{device_alias} && $hd1->{device} eq $hd2->{device_alias} + || $hd1->{device_alias} && $hd2->{device} && $hd1->{device_alias} eq $hd2->{device} + || $hd1->{device_alias} && $hd2->{device_alias} && $hd1->{device_alias} eq $hd2->{device_alias}; } } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 484e180b9..54d1694e2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ -- disbale encryption option for /boot +- disable encryption option for /boot +- match partitions when one of them as device_alias to the device of the other one Version 13.50 - 06 May 2011 |