From 463989dafebba2e45ad97bf45ad53a661bf908e9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 29 Dec 2003 08:25:38 +0000
Subject: for removable devices, we've to remove/add them one by one, so when
 several devices of the same class are removed/added, we ask if we should
 handle them several time.

let ask confirmation once per class instead (olivier blin, #6649)
---
 perl-install/standalone/service_harddrake | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index c7dd82de0..c17f272f6 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -78,22 +78,22 @@ foreach (@harddrake::data::tree) {
     }
 
     next unless -x first(split /\s+/, $configurator_pool[0]);
-    foreach my $configurator (@configurator_pool) {
-        my ($pid, $no);
-        $SIG{ALRM} = sub { $no = 1; kill 15, $pid };
-        unless ($pid = fork()) {
-            exec("/usr/share/harddrake/confirm 'Hardware changes in $Ident class ($timeout seconds to answer)' '" . $msg . "Do you want to run the appropriate config tool ?'");
-        }
-        alarm($timeout);
-        wait();
-        my $res = $?;
-        alarm(0);
-        if ($no) {
-            require interactive;
-            undef $wait;
-            $in ||= interactive->vnew;
-            $wait = $in->wait_message(N("Please wait"), N("Hardware probing in progress"));
-        } elsif ($res) {
+    my ($pid, $no);
+    $SIG{ALRM} = sub { $no = 1; kill 15, $pid };
+    unless ($pid = fork()) {
+        exec("/usr/share/harddrake/confirm 'Hardware changes in $Ident class ($timeout seconds to answer)' '" . $msg . "Do you want to run the appropriate config tool ?'");
+    }
+    alarm($timeout);
+    wait();
+    my $res = $?;
+    alarm(0);
+    if ($no) {
+        require interactive;
+        undef $wait;
+        $in ||= interactive->vnew;
+        $wait = $in->wait_message(N("Please wait"), N("Hardware probing in progress"));
+    } elsif ($res) {
+        foreach my $configurator (@configurator_pool) {
             if (fork()) {
                 wait();
             } else { exec("$configurator 2>/dev/null") or die "$configurator missing\n" }
-- 
cgit v1.2.1