[blivet][master/rhel7-branch] Fix traceback with write_dasd_conf. (#1072911)

Samantha N. Bueno sbueno+anaconda at redhat.com
Wed Mar 5 14:38:58 UTC 2014


The list of disks was compared to the wrong data type, so the
conditional was never true, which led non-s390x systems to attempt to
write a dasd.conf.

Resolves: rhbz#1072911
---
 blivet/devicelibs/dasd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blivet/devicelibs/dasd.py b/blivet/devicelibs/dasd.py
index 3f7fff1..7eb2551 100644
--- a/blivet/devicelibs/dasd.py
+++ b/blivet/devicelibs/dasd.py
@@ -114,7 +114,7 @@ def write_dasd_conf(disks, ROOT_PATH):
     """ Write /etc/dasd.conf to target system for all DASD devices
         configured during installation.
     """
-    if disks == {}:
+    if not (arch.isS390() or disks):
         return
 
     with open(os.path.realpath(ROOT_PATH + "/etc/dasd.conf"), "w") as f:
-- 
1.8.3.1



More information about the anaconda-patches mailing list