We were previously using tests that have diverged from what's going on in
yuminstall.py, so this brings the two backend tests into using the same
concept. Note that these checks can't be moved into the superclass, because
different backends need to use different mechanisms to find out the same
information.
---
livecd.py | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/livecd.py b/livecd.py
index 685e172..d1a4c64 100644
--- a/livecd.py
+++ b/livecd.py
@@ -348,6 +348,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
rc = proc.poll()
def doPostInstall(self, anaconda):
+ import rpm
+
self._doFilesystemMangling(anaconda)
# setup /etc/rpm/ for the post-install environment
@@ -355,12 +357,17 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
storage.writeEscrowPackets(anaconda)
- # maybe heavy handed, but it'll do
- if os.path.exists(anaconda.rootPath + "/usr/bin/rhgb") or os.path.exists(anaconda.rootPath + "/usr/bin/plymouth"):
+ iutil.resetRpmDb(anaconda.rootPath)
+ ts = rpm.TransactionSet(anaconda.rootPath)
+
+ if ts.dbMatch('provides', 'plymouth').count() or ts.dbMatch('provides', 'rhgb').count():
anaconda.id.bootloader.args.append("rhgb quiet")
- if os.path.exists(anaconda.rootPath + "/usr/sbin/gdm") or os.path.exists(anaconda.rootPath + "/usr/bin/kdm"):
+
+ if ts.dbMatch('provides', 'service(graphical-login)').count():
anaconda.id.desktop.setDefaultRunLevel(5)
+ ts.closeDB()
+
# now write out the "real" fstab and mtab
anaconda.id.storage.write(anaconda.rootPath)
f = open(anaconda.rootPath + "/etc/mtab", "w+")
--
1.6.5.rc2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
