From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 24 May 2006 19:42:12 +0000 (+0000)
Subject: - don't fail if /dev/ get's --bind mounted and /dev/root already exists there
X-Git-Tag: auto/th/anaconda-11_4_1_200808292136-1~73
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=commitdiff_plain;h=565aed063817f8edadf26089a9d64f515c3a723e

- don't fail if /dev/ get's --bind mounted and /dev/root already exists there

Changed files:
    anaconda-errorhandling.patch -> 1.2
---

diff --git a/anaconda-errorhandling.patch b/anaconda-errorhandling.patch
index 34a3ba9..d2c2a44 100644
--- a/anaconda-errorhandling.patch
+++ b/anaconda-errorhandling.patch
@@ -37,3 +37,14 @@
                  
              else:
                  os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
+--- anaconda-11.0.5/fsset.py~	2006-05-24 22:08:46.490080945 +0300
++++ anaconda-11.0.5/fsset.py	2006-05-24 22:17:32.421824167 +0300
+@@ -1284,6 +1284,8 @@
+             isys.makeDevInode(root.device.getDevice(), dev)        
+         rdev = os.stat(dev).st_rdev
+         
++        if os.path.exists(instPath + "/dev/root"):
++            os.unlink(instPath + "/dev/root")
+         os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev)
+ 
+     # return the "boot" device