[Uludag-commits] r16038 - in trunk/yali/yali: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Wed Nov 14 15:05:24 2007
New Revision: 16038

Modified:
   trunk/yali/yali/gui/ScrBootloader.py
   trunk/yali/yali/storage.py
Log:
Fix for bootloader usb support..

Modified: trunk/yali/yali/gui/ScrBootloader.py
=================================================================
--- trunk/yali/yali/gui/ScrBootloader.py	(original)
+++ trunk/yali/yali/gui/ScrBootloader.py	Wed Nov 14 15:05:24 2007
@@ -204,14 +204,13 @@
 
         info_window.close()
 
-        if self.noInstall.isChecked():
-            ctx.installData.bootLoaderDev = None
-
         root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root,
                                                                   request.mountRequestType)
 
         # install_dev
-        if self.installPart.isChecked():
+        if self.noInstall.isChecked():
+            ctx.installData.bootLoaderDev = None
+        elif self.installPart.isChecked():
             ctx.installData.bootLoaderDev = basename(root_part_req.partition().getPath())
         elif self.installMBR.isChecked():
             ctx.installData.bootLoaderDev = basename(self.device.getPath())

Modified: trunk/yali/yali/storage.py
=================================================================
--- trunk/yali/yali/storage.py	(original)
+++ trunk/yali/yali/storage.py	Wed Nov 14 15:05:24 2007
@@ -459,10 +459,7 @@
         for dev_type in ["hd*", "sd*"]:
             sysfs_devs = glob.glob("/sys/block/" + dev_type)
             for sysfs_dev in sysfs_devs:
-                if not int(open(sysfs_dev + "/removable").read().strip()):
-                    devlink = os.readlink(sysfs_dev + "/device")
-                    if not "/usb" in devlink:
-                        devices.append("/dev/" + os.path.basename(sysfs_dev))
+                devices.append("/dev/" + os.path.basename(sysfs_dev))
         devices.sort()
         return devices