diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-11-18 14:20:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-11-18 14:20:25 +0000 |
| commit | 9b92cf5f07d0857931e601fe4f67a90803b09ca3 (patch) | |
| tree | 99841a32ed0cc1cff290950a43fd0b7bbdd8ec81 | |
| parent | 3d244c6da8ee795cf9370db98d466f82cecfea02 (diff) | |
| download | drakx-backup-do-not-use-9b92cf5f07d0857931e601fe4f67a90803b09ca3.tar drakx-backup-do-not-use-9b92cf5f07d0857931e601fe4f67a90803b09ca3.tar.gz drakx-backup-do-not-use-9b92cf5f07d0857931e601fe4f67a90803b09ca3.tar.bz2 drakx-backup-do-not-use-9b92cf5f07d0857931e601fe4f67a90803b09ca3.tar.xz drakx-backup-do-not-use-9b92cf5f07d0857931e601fe4f67a90803b09ca3.zip | |
(entry) fix handling hdX/sdX devices (#53107)
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/devices.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c0f783244..afd265d49 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,7 @@ - partitioning wizard: o only display Help button in install +- diskdrake: + o fix handling hdX/sdX devices (#53107) - display_help: handle window.close() events (#55099) Version 12.77 - 30 October 2009 diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 26c7599a0..6168973a8 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -158,7 +158,7 @@ sub entry { } elsif (-e "/sys/block/$_/dev") { $sysdev = "/sys/block/$_/dev"; $type = c::S_IFBLK(); - } elsif (/(.+)(\d+)$/ && -e "/sys/block/$1/$2/dev") { + } elsif (/^(.+)(\d+)$/ && -e "/sys/block/$1/$_/dev") { $sysdev = "/sys/block/$_/dev"; $type = c::S_IFBLK(); } |