Attachment 939010 Details for Bug 1120206 – patch so --dirinstall will work

[patch] patch so --dirinstall will work

0001-Don-t-call-storage.write-for-dirinstall-1120206.patch (text/plain), 1.63 KB, created by Brian Lane on 2014-09-18 18:44:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Lane

Created: 2014-09-18 18:44:12 UTC

Size: 1.63 KB

patch

obsolete

>From aa44f2c45a056440117b3af6abf79a13c05e35d9 Mon Sep 17 00:00:00 2001
>From: "Brian C. Lane" <bcl@redhat.com>
>Date: Thu, 18 Sep 2014 10:20:28 -0700
>Subject: [rhel7/master] 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
>---
> pyanaconda/install.py | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/pyanaconda/install.py b/pyanaconda/install.py
>index 3c6bbc9..6b2bef6 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())
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1120206: 939010