[PATCH 1/2] Do not append "rhgb quiet" to s390 boot loader config (#570743)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Follow-on to 78d3854021245b1cb612be564d874fa8b2dca671.  As pointed out
on the mailing list, this problem was already discussed in another bug
and the correct fix was never actually pushed.  So here it is.  Put
parens around the ts.dbMatch tests and rely on the console on virtual
terminal test.

Related: rhbz#526364
---
 packages.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages.py b/packages.py
index 754b5c4..3ea0d05 100644
--- a/packages.py
+++ b/packages.py
@@ -305,9 +305,9 @@ def rpmSetupGraphicalSystem(anaconda):
     ts = rpm.TransactionSet(anaconda.rootPath)
 
     # Only add "rhgb quiet" on non-s390, non-serial installs
-    if not iutil.isS390() and iutil.isConsoleOnVirtualTerminal() and \
-       ts.dbMatch('provides', 'rhgb').count() or \
-       ts.dbMatch('provides', 'plymouth').count():
+    if iutil.isConsoleOnVirtualTerminal() and \
+       (ts.dbMatch('provides', 'rhgb').count() or \
+        ts.dbMatch('provides', 'plymouth').count()):
         anaconda.id.bootloader.args.append("rhgb quiet")
 
     if ts.dbMatch('provides', 'service(graphical-login)').count() and \
-- 
1.6.6.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux