- R: newer pykickstart

[packages/anaconda.git] / anaconda-errorhandling.patch

diff --git a/anaconda-errorhandling.patch b/anaconda-errorhandling.patch
index d2c2a44a1682fe81d755a2fae93b7335cc3bca5e..b67d63db46a7b6af6147e075840689e2ba5758cd 100644 (file)
--- a/anaconda-errorhandling.patch
+++ b/anaconda-errorhandling.patch
@@ -48,3 +48,28 @@
          os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev)
  
      # return the "boot" device
+--- anaconda-11.0.5/anaconda   2006-06-05 23:04:26.382957338 +0300
++++ anaconda-11.0.5/anaconda   2006-06-05 23:04:04.572468297 +0300
+@@ -952,7 +952,8 @@
+                             logfile = xlogfile,
+                             xStartedCB = doStartupX11Actions,
+                             xQuitCB = doShutdownX11Actions, useFB = useFBX)
+-    except RuntimeError:
++    except RuntimeError, msg:
++      log.warning("xserver.startX: %s", msg)
+       xsetup_failed = True
+ 
+     if xsetup_failed:
+--- anaconda-11.0.5/iutil.py~  2006-09-28 14:47:23.119103876 +0300
++++ anaconda-11.0.5/iutil.py   2006-09-28 18:12:24.254179111 +0300
+@@ -405,6 +405,10 @@
+ 
+ # make the device-mapper control node
+ def makeDMNode(root="/"):
++    # skip the mknod if path already exists -- created by udev
++    if os.path.exists(root + "/dev/mapper/control"):
++        return
++
+     major = minor = None
+ 
+     for (fn, devname, val) in ( ("/proc/devices", "misc", "major"),