From 8eb8482c4db24847ef58a50bea625b6311ca4675 Mon Sep 17 00:00:00 2001
From: Brian C. Lane <bcl@redhat.com>
Date: Sep 19 2014 16:12:10 +0000
Subject: Don't call storage.write for dirinstall (#1120206)


The logic got slightly corrupted with the ostree patches. With this fix
you can do:

anaconda --text --dirinstall --kickstart=./path/to/ks.cfg

to get an installed system in /mnt/sysimage/

Related: rhbz#1120206
(cherry picked from commit edb7da857895b59e1b0fceda6bc0320ab3ca50fd)

---

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 2455b1d..216cbcd 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -183,9 +183,8 @@ def doInstall(storage, payload, ksdata, instClass):
 
     turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall)
     write_storage_late = (flags.flags.livecdInstall or ksdata.ostreesetup.seen
-                          or ksdata.method.method == "liveimg"
-                          and not flags.flags.dirInstall)
-    if not write_storage_late:
+                          or ksdata.method.method == "liveimg")
+    if not write_storage_late and not flags.flags.dirInstall:
         storage.write()
 
     # Do packaging.
@@ -214,7 +213,7 @@ def doInstall(storage, payload, ksdata, instClass):
     payload.preInstall(packages=packages, groups=payload.languageGroups())
     payload.install()
 
-    if write_storage_late:
+    if write_storage_late and not flags.flags.dirInstall:
         if iutil.getSysroot() != iutil.getTargetPhysicalRoot():
             blivet.setSysroot(iutil.getTargetPhysicalRoot(),
                               iutil.getSysroot())