This needs a change in product.img creation process so that the
product.img looks similar as our updates.img (i.e. containing the whole
directory tree with /run/install/product).
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
dracut/anaconda-netroot.sh | 2 +-
pyanaconda/installclass.py | 2 +-
pyanaconda/packaging/yumpayload.py | 2 +-
pyanaconda/product.py | 2 +-
pyanaconda/ui/gui/hubs/progress.py | 2 +-
tests/pyanaconda_test/product_test.py | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh
index 0425661..6217953 100755
--- a/dracut/anaconda-netroot.sh
+++ b/dracut/anaconda-netroot.sh
@@ -58,7 +58,7 @@ case $repo in
updates=$(fetch_url $repo/images/updates.img)
[ -n "$updates" ] && unpack_updates_img $updates /updates
product=$(fetch_url $repo/images/product.img)
- [ -n "$product" ] && unpack_updates_img $product
/updates/tmp/product
+ [ -n "$product" ] && unpack_updates_img $product /updates
/sbin/dmsquash-live-root $runtime
fi
;;
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 753de20..1a39ca5 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -198,7 +198,7 @@ def availableClasses(showHidden=0):
for dir in env_path + ["installclasses",
"/tmp/updates/pyanaconda/installclasses",
- "/tmp/product/pyanaconda/installclasses",
+ "/run/install/product/pyanaconda/installclasses",
"%s/pyanaconda/installclasses" %
get_python_lib(plat_specific=1) ]:
if os.access(dir, os.R_OK):
path.append(dir)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 9fe60ad..caa8649 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -116,7 +116,7 @@ class YumPayload(PackagePayload):
self.install_device = None
self._root_dir = "/tmp/yum.root"
- self._repos_dir =
"/etc/yum.repos.d,/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anaconda.repos.d"
+ self._repos_dir =
"/etc/yum.repos.d,/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/run/install/product/anaconda.repos.d"
self._yum = None
self._setup = False
diff --git a/pyanaconda/product.py b/pyanaconda/product.py
index 0edab7d..97e248e 100644
--- a/pyanaconda/product.py
+++ b/pyanaconda/product.py
@@ -35,7 +35,7 @@ config.set("Main", "UUID", "")
config.set("Main", "Version",
os.environ.get("ANACONDA_PRODUCTVERSION", "bluesky"))
# Now read in the .buildstamp file, wherever it may be.
-config.read(["/tmp/product/.buildstamp", "/.buildstamp",
os.environ.get("PRODBUILDPATH", "")])
+config.read(["/run/install/product/.buildstamp", "/.buildstamp",
os.environ.get("PRODBUILDPATH", "")])
# Set up some variables we import throughout, applying a couple transforms as necessary.
bugUrl = config.get("Main", "BugURL")
diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 65cd9e4..06d63ad 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -147,7 +147,7 @@ class ProgressHub(Hub):
# directories without the language component. You know, just in case.
langs = expand_langs(os.environ["LANG"]) + [""]
paths = ["/tmp/updates/pixmaps/rnotes/%s/*.png",
- "/tmp/product/pixmaps/rnotes/%s/*.png",
+ "/run/install/product/pixmaps/rnotes/%s/*.png",
"/usr/share/anaconda/pixmaps/rnotes/%s/*.png"]
for (l, d) in itertools.product(langs, paths):
diff --git a/tests/pyanaconda_test/product_test.py
b/tests/pyanaconda_test/product_test.py
index 9b0d864..9338f8a 100644
--- a/tests/pyanaconda_test/product_test.py
+++ b/tests/pyanaconda_test/product_test.py
@@ -19,14 +19,14 @@ class ProductTest(mock.TestCase):
os.uname.return_value = ('', '', '', '',
'i386')
os.environ = {}
- # fake /tmp/product/.buildstamp file
+ # fake /run/install/product/.buildstamp file
self.BUGURL = 'http://bug.url'
self.FINAL = 'false'
self.ARCH = 'i386'
self.NAME = '__anaconda'
self.UUID = '123456.%s' % self.ARCH
self.VERSION = '14'
- self.FILENAME = '/tmp/product/.buildstamp'
+ self.FILENAME = '/run/install/product/.buildstamp'
self.FILE = \
"[Main]\n"\
"BugURL: %s\n"\
--
1.7.11.7