[master 1/1] fix storage writing for live and ostree installs (#1236937)

AdamWill installerbot-noreply at redhat.com
Wed Jul 15 22:39:25 UTC 2015


From: Adam Williamson <awilliam at redhat.com>

3e800998 broke storage writing in two cases: regular live
installs and ostree installs. The old write_storage_late check
checked for flags.livecdInstall and ksdata.ostreesetup.seen as
well as ksdata.method.method == "liveimg". The new check in
writeStorageLate() dropped those two, only keeping the method
check. The method is only 'liveimg' when doing a kickstart-
driven install with the 'liveimg' parameter, which is a fairly
niche case - the method is not 'liveimg' on a regular live
install (it's 'harddrive').
---
 pyanaconda/packaging/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index ada75ff..876f6ea 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -614,7 +614,8 @@ def writeStorageLate(self):
            every payload except for dnf.  Payloads should only implement one of
            these methods by overriding the unneeded one with a pass.
         """
-        if self.data.method.method == "liveimg" and not flags.dirInstall:
+        islive = self.data.method.method == "liveimg" or flags.livecdInstall
+        if (islive or self.data.ostreesetup.seen) and not flags.dirInstall:
             if iutil.getSysroot() != iutil.getTargetPhysicalRoot():
                 setSysroot(iutil.getTargetPhysicalRoot(), iutil.getSysroot())
 


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/906cef195c42b79070236787eba2477501a00cb2


More information about the anaconda-patches mailing list