Attachment 152651 Details for Bug 236481 – patch

[patch] patch

anaconda-11.2.0.49-ignore-ps3-flash.patch (text/plain), 1.84 KB, created by David Woodhouse on 2007-04-15 16:17:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-15 16:17:19 UTC

Size: 1.84 KB

patch

obsolete

>--- anaconda-11.2.0.49/partedUtils.py~	2007-04-10 19:49:04.000000000 +0100
>+++ anaconda-11.2.0.49/partedUtils.py	2007-04-15 17:12:37.000000000 +0100
>@@ -1090,7 +1090,10 @@ class DiskSet:
> 
>                     # if anaconda is None here, we are called from labelFactory
>                     if self.anaconda is not None:
>-                        if ks and (drive in clearDevs) and initAll:
>+                        if rhpl.getArch() == "ppc" and iutil.getPPCMachine() == "PS3" and isys.getBlockDeviceType(format) == "14\n":
>+                            log.warning("Skipping PS3 boot partition %s", format)
>+                            rc = 0
>+                        elif ks and (drive in clearDevs) and initAll:
>                             rc = 1
>                         else:
>                             rc = intf.messageWindow(_("Warning"),
>--- anaconda-11.2.0.49/isys/isys.py~	2007-03-28 20:25:24.000000000 +0100
>+++ anaconda-11.2.0.49/isys/isys.py	2007-04-15 17:12:21.000000000 +0100
>@@ -39,7 +39,7 @@ raidCount = {}
> 
> MIN_RAM = _isys.MIN_RAM
> MIN_GUI_RAM = _isys.MIN_GUI_RAM
>-EARLY_SWAP_RAM = _isys.EARLY_SWAP_RAM
>+EARLY_SWAP_RAM = 240000
> 
> def pathSpaceAvailable(path, fsystem = "ext2"):
>     return _isys.devSpaceFree(path)
>@@ -788,6 +788,18 @@ def mediaPresent(device):
>         os.close(fd)
>         return True
> 
>+def getBlockDeviceType(device):
>+    log.warning("dev type for %s", device)
>+    if not os.access("/sys/block/%s/device/type" % device, os.R_OK):
>+        log.warning("Could not open /sys/block/%s/device/type" % device)
>+        return None
>+
>+    fd = open("/sys/block/%s/device/type" % device, "r")
>+    lines = fd.readlines()
>+    for l in lines:
>+        log.warning("type of device %s is %s la la", device, l)
>+        return l
>+
> def driveIsIscsi(device):
>     # ewww.  just ewww.
>     if not os.path.islink("/sys/block/%s/device" %(device,)):

Actions: View | Diff

Attachments on bug 236481: 152651