diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-06-19 13:04:57 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-06-19 13:04:57 +0000 |
| commit | c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22 (patch) | |
| tree | 37aa1eb5dda34c5e9b343580d05dda8f47215f18 | |
| parent | c926520c06e748eacadaa2af695d812c8b26c99f (diff) | |
| download | drakx-c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22.tar drakx-c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22.tar.gz drakx-c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22.tar.bz2 drakx-c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22.tar.xz drakx-c5cfca81e636cdbe5b0c2a3b9723f7524dcdee22.zip | |
handle virtio when looking for major/minor of a block device (#49339)
| -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 c8c300ed9..c496c25f2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- handle virtio when looking for major/minor of a block device (#49339) + Version 12.39 - 16 Jun 2009 - properly handle hidden variables in installer and diskdrake. diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 0423e3598..886e2e4f6 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -77,7 +77,7 @@ sub entry { if (/^0x([\da-f]{3,4})$/i) { $type = c::S_IFBLK(); ($major, $minor) = unmakedev(hex $1); - } elsif (/^(sd.)(\d{0,2})/) { + } elsif (/^([sv]d.)(\d{0,2})/) { my $path = $2 ? "/sys/block/$1/$1$2/dev" : "/sys/block/$1/dev"; ($major, $minor) = split(':', chomp_(cat_($path))); $type = c::S_IFBLK(); |