From 45389d3508c3baedcabdea0eef0dea2631f5a9c7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/fs/type.pm')

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;
 }
-- 
cgit v1.2.1