From ddff323054ed16eac45325b776432b930590858b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 15 Dec 2008 16:44:06 +0000
Subject: (make) fix racing with udev (#41832)

---
 perl-install/NEWS       | 2 ++
 perl-install/devices.pm | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index af137f767..ef31d0041 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+  o fix racing with udev (#41832)
 - scannerdrake:
   o install task-scanning (so that xsane-gimp got installed)
 
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 4d1d9745e..6b091be27 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -185,7 +185,9 @@ sub make($) {
     #- make a directory for this inode if needed.
     mkdir_p(dirname($file));
 
-    syscall_('mknod', $file, $type | 0600, makedev($major, $minor)) or die "mknod failed (dev $_): $!";
+    syscall_('mknod', $file, $type | 0600, makedev($major, $minor)) or do {
+        die "mknod failed (dev $_): $!" if ! -e $file; # we may have raced with udev
+    };
 
     $file;
 }
-- 
cgit v1.2.1