Attachment 161257 Details for Bug 241439 – patch cleanup

[patch] patch cleanup

bug-sda15.patch (text/plain), 2.53 KB, created by Martin Sivák on 2007-08-14 07:36:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Sivák

Created: 2007-08-14 07:36:58 UTC

Size: 2.53 KB

patch

obsolete

>diff --git a/fsset.py b/fsset.py
>index d109859..94ef6a9 100644
>--- a/fsset.py
>+++ b/fsset.py
>@@ -1693,7 +1693,7 @@ MAILADDR root
> 		continue
> 
>             try:
>-                log.info("trying to mount %s on %s" %(entry.device.getDevice(), entry.mountpoint))
>+                log.info("trying to mount %s on %s" %(entry.device.setupDevice(), entry.mountpoint,))
>                 entry.mount(anaconda.rootPath, readOnly = readOnly)
>                 self.mountcount = self.mountcount + 1
>             except OSError, (num, msg):
>@@ -1716,6 +1716,7 @@ MAILADDR root
>                                              "Press <Enter> to reboot your "
>                                              "system.") % (entry.mountpoint,
>                                                            msg))
>+                log.error("OSError: (%d) %s" % (num, msg) )
>                 sys.exit(0)
>             except SystemError, (num, msg):
>                 if raiseErrors:
>@@ -1755,6 +1756,7 @@ MAILADDR root
> 
>                         self.messageWindow(_("Error"), errStr)
> 
>+                log.error("SystemError: (%d) %s" % (num, msg) )
>                 sys.exit(0)
> 
>         self.makeLVMNodes(anaconda.rootPath)
>@@ -2048,7 +2050,10 @@ class DevDevice(Device):
>         return self.device
> 
>     def setupDevice(self, chroot='/', devPrefix='/dev'):
>-        return "/dev/%s" %(self.getDevice(),)
>+        #We use precreated device but we have to make sure that the device exists
>+        path = '/dev/%s' % (devPrefix, self.getDevice(),)
>+        isys.makeDevInode(self.getDevice(), path)
>+        return path
> 
> class RAIDDevice(Device):
>     # XXX usedMajors does not take in account any EXISTING md device
>diff --git a/iutil.py b/iutil.py
>index 70d12bf..f8db183 100644
>--- a/iutil.py
>+++ b/iutil.py
>@@ -243,7 +243,7 @@ def makeDriveDeviceNodes():
>         elif drive.startswith("dasd"):
>             num = 4
>         else:
>-            num = 15
>+            num = 16
> 
>         if (drive.startswith("cciss") or drive.startswith("ida") or
>             drive.startswith("rd") or drive.startswith("sx8")):
>diff --git a/rescue.py b/rescue.py
>index 8c430e4..0b4054f 100644
>--- a/rescue.py
>+++ b/rescue.py
>@@ -435,7 +435,7 @@ def runRescue(anaconda, instClass):
>             # errors raise exceptions, while any runtime error will
>             # still result in a shell
>             (exc, val) = sys.exc_info()[0:2]
>-            log.error(val)
>+            log.error(str(exc)+": "+str(val))
>             if exc in (IndexError, ValueError, SyntaxError):
>                 raise exc, val, sys.exc_info()[2]
>

Actions: View | Diff

Attachments on bug 241439: 161152 | 161179 | 161257