diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:28:40 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:28:40 +0000 |
| commit | 45389d3508c3baedcabdea0eef0dea2631f5a9c7 (patch) | |
| tree | 864e02f47fffbda606df54945450dc026ef1b8b9 | |
| parent | 00669b95f6856a63fdafeadecef4ab0023d31d0d (diff) | |
| download | drakx-45389d3508c3baedcabdea0eef0dea2631f5a9c7.tar drakx-45389d3508c3baedcabdea0eef0dea2631f5a9c7.tar.gz drakx-45389d3508c3baedcabdea0eef0dea2631f5a9c7.tar.bz2 drakx-45389d3508c3baedcabdea0eef0dea2631f5a9c7.tar.xz drakx-45389d3508c3baedcabdea0eef0dea2631f5a9c7.zip | |
(call_blkid) use newly introduced get_stdout_raw() to reduce blkid
timeout to 30 seconds (mga#5979)
| -rw-r--r-- | perl-install/fs/type.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 6318e6804..528804655 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -273,7 +273,7 @@ sub call_blkid { my %h = map { if_(/(.*?)=(.*)/, $1 => $2); - } run_program::get_stdout('blkid', '2>', '/dev/null', '-o', 'udev', '-p', devices::make($part->{device})); + } run_program::get_stdout_raw({ timeout => 30 }, 'blkid', '2>', '/dev/null', '-o', 'udev', '-p', devices::make($part->{device})); \%h; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d8612b89e..ee74dfe02 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -7,6 +7,7 @@ o enable to go fast with 'tune-rpm'... - partitionning: o first attempt at supporting XenBlk discs + o reduce blkid timeout to 30 seconds - refactoring Version 14.22 - 15 May 2012 |