From 74d70fcd113ca0622959e272cb78cedc6509fbef Mon Sep 17 00:00:00 2001

From: Colin Walters <walters@verbum.org>

Date: Tue, 22 Apr 2014 14:39:26 -0400

Subject: [PATCH 04/20] iutil: Introduce getSysroot()/getTargetPhysicalRoot(),

 use instead of ROOT_PATH

For OSTree, the OS lives in a chroot, thus creating a distinction

between the "physical" root and the "deployment" root.  The physical

root as mounted by anaconda remains as /mnt/sysimage of course, but

*nearly* everything needs to reference the deployment, as that's where

the binaries, config files, etc live.

The deployment root is dynamic - we only know it after we do an

initial installation what the path will be.  This dynamic nature means

that the API is best as a function call.

Resolves: rhbz#1113535

Port of rpmostreepayload patches from master

commit 1b260c0c3ca70b53d44b543babe1a5ab06fb5fb5

---

 pyanaconda/__init__.py              |  6 +--

 pyanaconda/bootloader.py            | 96 +++++++++++++++++--------------------

 pyanaconda/constants.py             |  2 +

 pyanaconda/desktop.py               | 10 ++--

 pyanaconda/exception.py             | 10 ++--

 pyanaconda/install.py               |  6 +--

 pyanaconda/installclasses/fedora.py |  8 ++--

 pyanaconda/installclasses/rhel.py   |  3 +-

 pyanaconda/iutil.py                 | 48 ++++++++++++++++++-

 pyanaconda/kickstart.py             | 51 ++++++++++----------

 pyanaconda/packaging/__init__.py    | 40 ++++++++--------

 pyanaconda/packaging/livepayload.py | 25 +++++-----

 pyanaconda/packaging/tarpayload.py  |  2 +-

 pyanaconda/packaging/yumpayload.py  | 12 ++---

 pyanaconda/rescue.py                | 16 +++----

 pyanaconda/users.py                 |  7 ++-

 16 files changed, 187 insertions(+), 155 deletions(-)

diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py

index 9b58f92..fad7a90 100644

--- a/pyanaconda/__init__.py

+++ b/pyanaconda/__init__.py

@@ -30,11 +30,11 @@

 import os, time, string

 import sys

-from constants import ROOT_PATH

 from tempfile import mkstemp

 from pyanaconda.bootloader import get_bootloader

 from pyanaconda import constants

+from pyanaconda import iutil

 from pyanaconda import addons

 from pyanaconda.i18n import _

@@ -228,7 +228,7 @@ class Anaconda(object):

         if self.xdriver is None:

             return

         if root is None:

-            root = ROOT_PATH

+            root = iutil.getSysroot()

         if not os.path.isdir("%s/etc/X11" %(root,)):

             os.makedirs("%s/etc/X11" %(root,), mode=0755)

         f = open("%s/etc/X11/xorg.conf" %(root,), 'w')

@@ -241,7 +241,7 @@ class Anaconda(object):

         network.write_sysconfig_network()

         network.disableIPV6()

-        network.copyConfigToPath(ROOT_PATH)

+        network.copyConfigToPath(iutil.getSysroot())

         if not self.ksdata:

             self.instClass.setNetworkOnbootDefault()

         self.desktop.write()

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py

index 2fc1d49..90aec61 100644

--- a/pyanaconda/bootloader.py

+++ b/pyanaconda/bootloader.py

@@ -34,7 +34,6 @@ from blivet.devicelibs import mdraid

 from pyanaconda.isys import sync

 from pyanaconda.product import productName

 from pyanaconda.flags import flags

-from pyanaconda.constants import *

 from blivet.errors import StorageError

 from blivet.fcoe import fcoe

 import pyanaconda.network

@@ -929,19 +928,19 @@ class BootLoader(object):

     def write_config_post(self):

         try:

-            os.chmod(ROOT_PATH + self.config_file, self.config_file_mode)

+            os.chmod(iutil.getSysroot() + self.config_file, self.config_file_mode)

         except OSError as e:

             log.error("failed to set config file permissions: %s" % e)

     def add_crash_args(self):

         buf = ""

-        if os.access("%s%s" % (ROOT_PATH, "/usr/sbin/rhcrashkernel-param"), \

+        if os.access("%s%s" % (iutil.getSysroot(), "/usr/sbin/rhcrashkernel-param"), \

                      os.X_OK):

             (pread, pwrite) = os.pipe()

             os.close(pwrite)

             buf = iutil.execWithCapture("/usr/sbin/rhcrashkernel-param", [],

                                         stdin=pread,

-                                        root=ROOT_PATH)

+                                        root=iutil.getSysroot())

             os.close(pread)

         self.boot_args.add(buf.replace('\n', ' '))

@@ -952,7 +951,7 @@ class BootLoader(object):

         self.add_crash_args()

-        config_path = os.path.normpath(ROOT_PATH + self.config_file)

+        config_path = os.path.normpath(iutil.getSysroot() + self.config_file)

         if os.access(config_path, os.R_OK):

             os.rename(config_path, config_path + ".anacbak")

@@ -988,7 +987,7 @@ class BootLoader(object):

         self.write_config()

         sync()

-        self.stage2_device.format.sync(root=ROOT_PATH)

+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())

         self.install()

     def install(self):

@@ -1180,7 +1179,7 @@ class GRUB(BootLoader):

         if iutil.isConsoleOnVirtualTerminal(self.console):

             splash = "splash.xpm.gz"

-            splash_path = os.path.normpath("%s/boot/%s/%s" % (ROOT_PATH,

+            splash_path = os.path.normpath("%s/boot/%s/%s" % (iutil.getSysroot(),

                                                         self.splash_dir,

                                                         splash))

             if os.access(splash_path, os.R_OK):

@@ -1233,7 +1232,7 @@ class GRUB(BootLoader):

     def write_device_map(self):

         """ Write out a device map containing all supported devices. """

-        map_path = os.path.normpath(ROOT_PATH + self.device_map_file)

+        map_path = os.path.normpath(iutil.getSysroot() + self.device_map_file)

         if os.access(map_path, os.R_OK):

             os.rename(map_path, map_path + ".anacbak")

@@ -1249,7 +1248,7 @@ class GRUB(BootLoader):

         super(GRUB, self).write_config_post()

         # make symlink for menu.lst (grub's default config file name)

-        menu_lst = "%s%s/menu.lst" % (ROOT_PATH, self.config_dir)

+        menu_lst = "%s%s/menu.lst" % (iutil.getSysroot(), self.config_dir)

         if os.access(menu_lst, os.R_OK):

             try:

                 os.rename(menu_lst, menu_lst + '.anacbak')

@@ -1262,7 +1261,7 @@ class GRUB(BootLoader):

             log.error("failed to create grub menu.lst symlink: %s" % e)

         # make symlink to grub.conf in /etc since that's where configs belong

-        etc_grub = "%s/etc/%s" % (ROOT_PATH, self._config_file)

+        etc_grub = "%s/etc/%s" % (iutil.getSysroot(), self._config_file)

         if os.access(etc_grub, os.R_OK):

             try:

                 os.unlink(etc_grub)

@@ -1320,9 +1319,8 @@ class GRUB(BootLoader):

         return targets

-    def install(self):

-        rc = iutil.execWithRedirect("grub-install", ["--just-copy"],

-                                    root=ROOT_PATH)

+    def install(self, args=None):

+        rc = iutil.execInSysroot("grub-install", ["--just-copy"])

         if rc:

             raise BootLoaderError("bootloader install failed")

@@ -1342,8 +1340,7 @@ class GRUB(BootLoader):

             os.close(pwrite)

             args = ["--batch", "--no-floppy",

                     "--device-map=%s" % self.device_map_file]

-            rc = iutil.execWithRedirect("grub", args,

-                                        stdin=pread, root=ROOT_PATH)

+            rc = iutil.execInSysroot("grub", args, stdin=pread)

             os.close(pread)

             if rc:

                 raise BootLoaderError("bootloader install failed")

@@ -1452,7 +1449,7 @@ class GRUB2(GRUB):

     def write_device_map(self):

         """ Write out a device map containing all supported devices. """

-        map_path = os.path.normpath(ROOT_PATH + self.device_map_file)

+        map_path = os.path.normpath(iutil.getSysroot() + self.device_map_file)

         if os.access(map_path, os.R_OK):

             os.rename(map_path, map_path + ".anacbak")

@@ -1477,7 +1474,7 @@ class GRUB2(GRUB):

         dev_map.close()

     def write_defaults(self):

-        defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file)

+        defaults_file = "%s%s" % (iutil.getSysroot(), self.defaults_file)

         defaults = open(defaults_file, "w+")

         defaults.write("GRUB_TIMEOUT=%d\n" % self.timeout)

         defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\"\n")

@@ -1511,7 +1508,7 @@ class GRUB2(GRUB):

         os.close(pwrite)

         buf = iutil.execWithCapture("grub2-mkpasswd-pbkdf2", [],

                                     stdin=pread,

-                                    root=ROOT_PATH)

+                                    root=iutil.getSysroot())

         os.close(pread)

         self.encrypted_password = buf.split()[-1].strip()

         if not self.encrypted_password.startswith("grub.pbkdf2."):

@@ -1521,7 +1518,7 @@ class GRUB2(GRUB):

         if not self.password and not self.encrypted_password:

             return

-        users_file = ROOT_PATH + "/etc/grub.d/01_users"

+        users_file = iutil.getSysroot() + "/etc/grub.d/01_users"

         header = open(users_file, "w")

         header.write("#!/bin/sh -e\n\n")

         header.write("cat << \"EOF\"\n")

@@ -1555,16 +1552,13 @@ class GRUB2(GRUB):

         # make sure the default entry is the OS we are installing

         entry_title = "%s Linux, with Linux %s" % (productName,

                                                    self.default.version)

-        rc = iutil.execWithRedirect("grub2-set-default",

-                                    [entry_title],

-                                    root=ROOT_PATH)

+        rc = iutil.execInSysroot("grub2-set-default", [entry_title])

         if rc:

             log.error("failed to set default menu entry to %s" % productName)

         # now tell grub2 to generate the main configuration file

-        rc = iutil.execWithRedirect("grub2-mkconfig",

-                                    ["-o", self.config_file],

-                                    root=ROOT_PATH)

+        rc = iutil.execInSysroot("grub2-mkconfig",

+                                 ["-o", self.config_file])

         if rc:

             raise BootLoaderError("failed to write bootloader configuration")

@@ -1585,7 +1579,7 @@ class GRUB2(GRUB):

                 grub_args.insert(0, '--force')

             rc = iutil.execWithRedirect("grub2-install", grub_args,

-                                        root=ROOT_PATH,

+                                        root=iutil.getSysroot(),

                                         env_prune=['MALLOC_PERTURB_'])

             if rc:

                 raise BootLoaderError("bootloader install failed")

@@ -1600,14 +1594,14 @@ class GRUB2(GRUB):

             return

         self.write_device_map()

-        self.stage2_device.format.sync(root=ROOT_PATH)

+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())

         sync()

         self.install()

         sync()

-        self.stage2_device.format.sync(root=ROOT_PATH)

+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())

         self.write_config()

         sync()

-        self.stage2_device.format.sync(root=ROOT_PATH)

+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())

     def check(self):

         """ When installing to the mbr of a disk grub2 needs enough space

@@ -1676,7 +1670,7 @@ class EFIGRUB(GRUB2):

         else:

             exec_func = iutil.execWithRedirect

         if "root" not in kwargs:

-            kwargs["root"] = ROOT_PATH

+            kwargs["root"] = iutil.getSysroot()

         return exec_func("efibootmgr", list(args), **kwargs)

@@ -1722,7 +1716,8 @@ class EFIGRUB(GRUB2):

         rc = self.efibootmgr("-c", "-w", "-L", productName,

                              "-d", boot_disk.path, "-p", boot_part_num,

                              "-l",

-                             self.efi_dir_as_efifs_dir + self._efi_binary)

+                             self.efi_dir_as_efifs_dir + self._efi_binary,

+                             root=iutil.getSysroot())

         if rc:

             raise BootLoaderError("failed to set new efi boot target")

@@ -1747,7 +1742,7 @@ class EFIGRUB(GRUB2):

             return

         sync()

-        self.stage2_device.format.sync(root=ROOT_PATH)

+        self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())

         self.install()

         self.write_config()

@@ -1765,9 +1760,8 @@ class Aarch64EFIGRUB(EFIGRUB):

 class MacEFIGRUB(EFIGRUB):

     def mactel_config(self):

-        if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"):

-            rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [],

-                                        root=ROOT_PATH)

+        if os.path.exists(iutil.getSysroot() + "/usr/libexec/mactel-boot-setup"):

+            rc = iutil.execInSysroot("/usr/libexec/mactel-boot-setup", [])

             if rc:

                 log.error("failed to configure Mac bootloader")

@@ -1881,7 +1875,7 @@ class Yaboot(YabootBase):

         super(Yaboot, self).write_config_post()

         # make symlink in /etc to yaboot.conf if config is in /boot/etc

-        etc_yaboot_conf = ROOT_PATH + "/etc/yaboot.conf"

+        etc_yaboot_conf = iutil.getSysroot() + "/etc/yaboot.conf"

         if not os.access(etc_yaboot_conf, os.R_OK):

             try:

                 os.symlink("../boot/etc/yaboot.conf", etc_yaboot_conf)

@@ -1889,8 +1883,8 @@ class Yaboot(YabootBase):

                 log.error("failed to create /etc/yaboot.conf symlink: %s" % e)

     def write_config(self):

-        if not os.path.isdir(ROOT_PATH + self.config_dir):

-            os.mkdir(ROOT_PATH + self.config_dir)

+        if not os.path.isdir(iutil.getSysroot() + self.config_dir):

+            os.mkdir(iutil.getSysroot() + self.config_dir)

         # this writes the config

         super(Yaboot, self).write_config()

@@ -1901,8 +1895,7 @@ class Yaboot(YabootBase):

     def install(self):

         args = ["-f", "-C", self.config_file]

-        rc = iutil.execWithRedirect(self.prog, args,

-                                    root=ROOT_PATH)

+        rc = iutil.execInSysroot(self.prog, args)

         if rc:

             raise BootLoaderError("bootloader installation failed")

@@ -2027,7 +2020,7 @@ class IPSeriesGRUB2(GRUB2):

     def write_defaults(self):

         super(IPSeriesGRUB2, self).write_defaults()

-        defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file)

+        defaults_file = "%s%s" % (iutil.getSysroot(), self.defaults_file)

         defaults = open(defaults_file, "a+")

         # The terminfo's X and Y size, and output location could change in the future

         defaults.write("GRUB_TERMINFO=\"terminfo -g 80x24 console\"\n")

@@ -2142,10 +2135,8 @@ class ZIPL(BootLoader):

     # installation

     #

-    def install(self):

-        buf = iutil.execWithCapture("zipl", [],

-                                    root=ROOT_PATH,

-                                    fatal=True)

+    def install(self, args=None):

+        buf = iutil.execWithCapture("zipl", [], root=iutil.getSysroot(), fatal=True)

         for line in buf.splitlines():

             if line.startswith("Preparing boot device: "):

                 # Output here may look like:

@@ -2192,7 +2183,7 @@ class UBOOT(BootLoader):

     def install(self):

         # a-b-c is a tool that generates a generic boor.scr that works in most situations.

         # not perfect but is better than doing nothing

-        rc = iutil.execWithRedirect("a-b-c", [], root=ROOT_PATH)

+        rc = iutil.execWithRedirect("a-b-c", [], root=iutil.getSysroot())

         if rc:

             raise BootLoaderError("bootloader install failed")

@@ -2274,7 +2265,7 @@ class EXTLINUX(BootLoader):

             config.write("menu notabmsg Press [Tab] and enter the password to edit options")

     def write_config_post(self):

-        etc_extlinux = os.path.normpath(ROOT_PATH + "/etc/" + self._config_file)

+        etc_extlinux = os.path.normpath(iutil.getSysroot() + "/etc/" + self._config_file)

         if not os.access(etc_extlinux, os.R_OK):

             try:

                 os.symlink("../boot/%s" % self._config_file, etc_extlinux)

@@ -2291,8 +2282,7 @@ class EXTLINUX(BootLoader):

     def install(self):

         backup = "%s/backup.b" % self._config_dir

         args = ["--install", self._config_dir]

-        rc = iutil.execWithRedirect("extlinux", args,

-                                    root=ROOT_PATH)

+        rc = iutil.execInSysroot("extlinux", args)

         if rc:

             raise BootLoaderError("bootloader install failed")

@@ -2326,9 +2316,9 @@ def writeSysconfigKernel(storage, version):

     # get the name of the default kernel package based on the version

     kernel_basename = "vmlinuz-" + version

     kernel_file = "/boot/%s" % kernel_basename

-    if not os.path.isfile(ROOT_PATH + kernel_file):

+    if not os.path.isfile(iutil.getSysroot() + kernel_file):

         kernel_file = "/boot/efi/EFI/redhat/%s" % kernel_basename

-        if not os.path.isfile(ROOT_PATH + kernel_file):

+        if not os.path.isfile(iutil.getSysroot() + kernel_file):

             log.error("failed to recreate path to default kernel image")

             return

@@ -2338,7 +2328,7 @@ def writeSysconfigKernel(storage, version):

         log.error("failed to import rpm python module")

         return

-    ts = rpm.TransactionSet(ROOT_PATH)

+    ts = rpm.TransactionSet(iutil.getSysroot())

     mi = ts.dbMatch('basenames', kernel_file)

     try:

         h = mi.next()

@@ -2348,7 +2338,7 @@ def writeSysconfigKernel(storage, version):

     kernel = h.name

-    f = open(ROOT_PATH + "/etc/sysconfig/kernel", "w+")

+    f = open(iutil.getSysroot() + "/etc/sysconfig/kernel", "w+")

     f.write("# UPDATEDEFAULT specifies if new-kernel-pkg should make\n"

             "# new kernels the default\n")

     # only update the default if we're setting the default to linux (#156678)

diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py

index e864630..1d523c0 100644

--- a/pyanaconda/constants.py

+++ b/pyanaconda/constants.py

@@ -80,6 +80,8 @@ DD_RPMS = "/tmp/DD-*"

 TRANSLATIONS_UPDATE_DIR="/tmp/updates/po"

 ANACONDA_CLEANUP = "anaconda-cleanup"

+# This is a legacy variable; new code should use iutil.getSysroot()

+# or iutil.getTargetPhysicalRoot().

 ROOT_PATH = os.environ.get("ANACONDA_ROOT_PATH", "/mnt/sysimage")

 MOUNT_DIR = "/mnt/install"

 DRACUT_REPODIR = "/run/install/repo"

diff --git a/pyanaconda/desktop.py b/pyanaconda/desktop.py

index fde1dc7..c4edf2f 100644

--- a/pyanaconda/desktop.py

+++ b/pyanaconda/desktop.py

@@ -21,7 +21,8 @@

 import os

 from simpleconfig import SimpleConfigFile

-from pyanaconda.constants import ROOT_PATH, RUNLEVELS

+from pyanaconda.constants import RUNLEVELS

+from pyanaconda import iutil

 import logging

 log = logging.getLogger("anaconda")

@@ -51,14 +52,15 @@ class Desktop(SimpleConfigFile):

     def write(self):

         if self.getDefaultDesktop():

-            f = open(ROOT_PATH + "/etc/sysconfig/desktop", "w")

+            f = open(iutil.getSysroot() + "/etc/sysconfig/desktop", "w")

             f.write(str(self))

             f.close()

-        if not os.path.isdir(ROOT_PATH + '/etc/systemd/system'):

+        if not os.path.isdir(iutil.getSysroot() + '/etc/systemd/system'):

             log.warning("there is no /etc/systemd/system directory, cannot update default.target!")

             return

-        default_target = ROOT_PATH + '/etc/systemd/system/default.target'

+

+        default_target = iutil.getSysroot() + '/etc/systemd/system/default.target'

         if os.path.islink(default_target):

             os.unlink(default_target)

         os.symlink('/lib/systemd/system/%s' % RUNLEVELS[self.runlevel],

diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py

index 861425f..fe2bb8d 100644

--- a/pyanaconda/exception.py

+++ b/pyanaconda/exception.py

@@ -34,7 +34,7 @@ import kickstart

 import blivet.errors

 from pyanaconda.errors import CmdlineError

 from pyanaconda.ui.communication import hubQ

-from pyanaconda.constants import ROOT_PATH, THREAD_EXCEPTION_HANDLING_TEST

+from pyanaconda.constants import THREAD_EXCEPTION_HANDLING_TEST

 from pyanaconda.threads import threadMgr

 from pyanaconda.i18n import _

 from pyanaconda import flags

@@ -159,12 +159,12 @@ class AnacondaExceptionHandler(ExceptionHandler):

         anaconda = dump_info.object

         # See if there is a /root present in the root path and put exception there as well

-        if os.access(ROOT_PATH + "/root", os.X_OK):

+        if os.access(iutil.getSysroot() + "/root", os.X_OK):

             try:

-                dest = ROOT_PATH + "/root/%s" % os.path.basename(self.exnFile)

+                dest = iutil.getSysroot() + "/root/%s" % os.path.basename(self.exnFile)

                 shutil.copyfile(self.exnFile, dest)

             except:

-                log.error("Failed to copy %s to %s/root" % (self.exnFile, ROOT_PATH))

+                log.error("Failed to copy %s to %s/root" % (self.exnFile, iutil.getSysroot()))

                 pass

         # run kickstart traceback scripts (if necessary)

@@ -213,7 +213,7 @@ class AnacondaExceptionHandler(ExceptionHandler):

 def initExceptionHandling(anaconda):

     fileList = [ "/tmp/anaconda.log", "/tmp/packaging.log",

                  "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log",

-                 "/tmp/yum.log", ROOT_PATH + "/root/install.log",

+                 "/tmp/yum.log", iutil.getSysroot() + "/root/install.log",

                  "/proc/cmdline" ]

     if flags.flags.livecdInstall:

         fileList.extend(["/var/log/messages"])

diff --git a/pyanaconda/install.py b/pyanaconda/install.py

index 5796086..db66e78 100644

--- a/pyanaconda/install.py

+++ b/pyanaconda/install.py

@@ -20,12 +20,12 @@

 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>

 #

-from pyanaconda.constants import ROOT_PATH, THREAD_PAYLOAD

 from blivet import turnOnFilesystems

 from pyanaconda.bootloader import writeBootLoader

 from pyanaconda.progress import progress_report, progressQ

 from pyanaconda.users import createLuserConf, getPassAlgo, Users

 from pyanaconda import flags

+from pyanaconda import iutil

 from pyanaconda import timezone

 from pyanaconda.i18n import _

 from pyanaconda.threads import threadMgr

@@ -35,7 +35,7 @@ log = logging.getLogger("anaconda")

 def _writeKS(ksdata):

     import os

-    path = ROOT_PATH + "/root/anaconda-ks.cfg"

+    path = iutil.getSysroot() + "/root/anaconda-ks.cfg"

     # Clear out certain sensitive information that kickstart doesn't have a

     # way of representing encrypted.

@@ -80,7 +80,7 @@ def doConfiguration(storage, payload, ksdata, instClass):

     # Creating users and groups requires some pre-configuration.

     with progress_report(_("Creating users")):

-        createLuserConf(ROOT_PATH, algoname=getPassAlgo(ksdata.authconfig.authconfig))

+        createLuserConf(iutil.getSysroot(), algoname=getPassAlgo(ksdata.authconfig.authconfig))

         u = Users()

         ksdata.rootpw.execute(storage, ksdata, instClass, u)

         ksdata.group.execute(storage, ksdata, instClass, u)

diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py

index 98e922f..3e0a5f2 100644

--- a/pyanaconda/installclasses/fedora.py

+++ b/pyanaconda/installclasses/fedora.py

@@ -18,11 +18,11 @@

 #

 from pyanaconda.installclass import BaseInstallClass

-from pyanaconda.constants import *

-from pyanaconda.product import *

+from pyanaconda.product import productName

 from pyanaconda import network

+from pyanaconda import iutil

 from pyanaconda import nm

-from pyanaconda.i18n import _

+from pyanaconda.i18n import _, N_

 import os, types

@@ -68,7 +68,7 @@ class InstallClass(BaseInstallClass):

             except ValueError as e:

                 continue

             if link_up:

-                ifcfg_path = network.find_ifcfg_file_of_device(devName, root_path=ROOT_PATH)

+                ifcfg_path = network.find_ifcfg_file_of_device(devName, root_path=iutil.getSysroot())

                 if not ifcfg_path:

                     continue

                 ifcfg = network.IfcfgFile(ifcfg_path)

diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py

index f3e5a99..74052fd 100644

--- a/pyanaconda/installclasses/rhel.py

+++ b/pyanaconda/installclasses/rhel.py

@@ -22,6 +22,7 @@ from pyanaconda.constants import *

 from pyanaconda.product import *

 from pyanaconda import network

 from pyanaconda import nm

+from pyanaconda import iutil

 import types

 class InstallClass(BaseInstallClass):

@@ -71,7 +72,7 @@ class InstallClass(BaseInstallClass):

             return

         if nm.nm_device_type_is_wifi(devName):

             return

-        ifcfg_path = network.find_ifcfg_file_of_device(devName, root_path=ROOT_PATH)

+        ifcfg_path = network.find_ifcfg_file_of_device(devName, root_path=iutil.getSysroot())

         if not ifcfg_path:

             return

         ifcfg = network.IfcfgFile(ifcfg_path)

diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py

index 8d6b31b..46f8079 100644

--- a/pyanaconda/iutil.py

+++ b/pyanaconda/iutil.py

@@ -44,10 +44,44 @@ from anaconda_log import program_log_lock

 def augmentEnv():

     env = os.environ.copy()

     env.update({"LC_ALL": "C",

-                "ANA_INSTALL_PATH": ROOT_PATH

+                "ANA_INSTALL_PATH": getSysroot()

                })

     return env

+def getTargetPhysicalRoot():

+    """Returns the path to the "physical" storage root, traditionally /mnt/sysimage.

+

+    This may be distinct from the sysroot, which could be a

+    chroot-type subdirectory of the physical root.  This is used for

+    example by all OSTree-based installations.

+    """

+

+    # We always use the traditional /mnt/sysimage - the physical OS

+    # target is never mounted anywhere else.  This API call just

+    # allows us to have a clean "git grep ROOT_PATH" in other parts of

+    # the code.

+    return ROOT_PATH

+

+_sysroot = ROOT_PATH

+

+def getSysroot():

+    """Returns the path to the target OS installation.

+

+    For ordinary package-based installations, this is the same as the

+    target root.

+    """

+    return _sysroot

+

+def setSysroot(path):

+    """Change the OS root path.

+       :param path: The new OS root path

+

+    This should only be used by Payload subclasses which install operating

+    systems to non-default roots.

+    """

+    global _sysroot

+    _sysroot = path

+

 def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None, log_output=True, binary_output=False):

     """ Run an external program, log the output and return it to the caller

         @param argv The command to run and argument

@@ -105,6 +139,16 @@ def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None, log_ou

     return (proc.returncode, output_string)

+def execInSysroot(command, argv, stdin=None):

+    """ Run an external program in the target root.

+        :param command: The command to run

+        :param argv: The argument list

+        :param stdin: The file object to read stdin from.

+        :return: The return code of the command

+    """

+

+    return execWithRedirect(command, argv, stdin=stdin, root=getSysroot())

+

 def execWithRedirect(command, argv, stdin=None, stdout=None,

                      stderr=None, root='/', env_prune=[], log_output=True, binary_output=False):

     """ Run an external program and redirect the output to a file.

@@ -323,7 +367,7 @@ def reIPL(ipldev):

         log.info("reIPL configuration successful")

 def resetRpmDb():

-    for rpmfile in glob.glob("%s/var/lib/rpm/__db.*" % ROOT_PATH):

+    for rpmfile in glob.glob("%s/var/lib/rpm/__db.*" % getSysroot()):

         try:

             os.unlink(rpmfile)

         except OSError as e:

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py

index df7b5e6..92a406a 100644

--- a/pyanaconda/kickstart.py

+++ b/pyanaconda/kickstart.py

@@ -40,7 +40,7 @@ import tempfile

 import subprocess

 import flags as flags_module

 from flags import flags

-from constants import *

+from constants import ADDON_PATHS

 import shlex

 import sys

 import urlgrabber

@@ -227,14 +227,14 @@ class Authconfig(commands.authconfig.FC3_Authconfig):

         args = ["--update", "--nostart"] + shlex.split(self.authconfig)

         if not flags.automatedInstall and \

-           (os.path.exists(ROOT_PATH + "/lib64/security/pam_fprintd.so") or \

-            os.path.exists(ROOT_PATH + "/lib/security/pam_fprintd.so")):

+           (os.path.exists(iutil.getSysroot() + "/lib64/security/pam_fprintd.so") or \

+            os.path.exists(iutil.getSysroot() + "/lib/security/pam_fprintd.so")):

             args += ["--enablefingerprint"]

         try:

-            iutil.execWithRedirect("/usr/sbin/authconfig", args, root=ROOT_PATH)

+            iutil.execInSysroot("/usr/sbin/authconfig", args)

         except OSError as msg:

-            log.error("Error running /usr/sbin/authconfig %s: %s", args, msg)

+            log.error("Error running /usr/sbin/authconfig %s: %s" %  (args, msg))

 class AutoPart(commands.autopart.F20_AutoPart):

     def execute(self, storage, ksdata, instClass):

@@ -470,7 +470,7 @@ class Realm(commands.realm.F19_Realm):

             # no explicit password arg using implicit --no-password

             pw_args = ["--no-password"]

-        argv = ["realm", "join", "--install", ROOT_PATH, "--verbose"] + \

+        argv = ["realm", "join", "--install", iutil.getSysroot(), "--verbose"] + \

                pw_args + self.join_args

         rc = -1

         try:

@@ -581,11 +581,11 @@ class Firewall(commands.firewall.F20_Firewall):

             args += [ "--service=%s" % (service,) ]

         cmd = "/usr/bin/firewall-offline-cmd"

-        if not os.path.exists(ROOT_PATH+cmd):

+        if not os.path.exists(iutil.getSysroot()+cmd):

             msg = _("%s is missing. Cannot setup firewall.") % (cmd,)

             raise KickstartError(msg)

         else:

-            iutil.execWithRedirect(cmd, args, root=ROOT_PATH)

+            iutil.execInSysroot(cmd, args)

 class Firstboot(commands.firstboot.FC3_Firstboot):

     def setup(self, *args):

@@ -598,7 +598,7 @@ class Firstboot(commands.firstboot.FC3_Firstboot):

                          "/lib/systemd/system/initial-setup-graphical.service",