From 850f322414aa53c5bde28519f3523bae4c0bad03 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 6 Jan 2009 13:39:55 +0000
Subject: (make) fix racing with udev (#41832) [backported from trunk]

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 97b8e85f4..c10bc1503 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - diskdrake:
   o fix crashing on writing fstab when using SMB (#46084)
+  o fix racing with udev (#41832)
   o --nfs: handle "host:/" (#44320)
 
 Version 11.71.2 - 5 December 2008
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