From 45389d3508c3baedcabdea0eef0dea2631f5a9c7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 May 2012 18:28:40 +0000 Subject: (call_blkid) use newly introduced get_stdout_raw() to reduce blkid timeout to 30 seconds (mga#5979) --- perl-install/fs/type.pm | 2 +- perl-install/install/NEWS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1