From 654534e6943b551517b94ed2e1c33c2ed6595a7c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 5 Apr 2017 18:22:09 -0700 Subject: [PATCH] Work around RHBZ #1439429 when running Firefox on X --- lib/freeipa.pm | 2 ++ lib/utils.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/freeipa.pm b/lib/freeipa.pm index eed53a7c..7eeba980 100644 --- a/lib/freeipa.pm +++ b/lib/freeipa.pm @@ -34,6 +34,8 @@ sub add_user { # it's at a console ready to start Firefox. sub start_webui { my ($user, $password) = @_; + # https://bugzilla.redhat.com/show_bug.cgi?id=1439429 + assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx"; type_string "startx /usr/bin/firefox -width 1024 -height 768 https://ipa001.domain.local\n"; wait_still_screen 5; assert_screen "freeipa_webui_login"; diff --git a/lib/utils.pm b/lib/utils.pm index 8b91409d..849a0fc4 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -268,6 +268,8 @@ sub start_cockpit { # on localhost) shown. If $login is truth-y, also log in. Assumes # X and Firefox are installed. my $login = shift || 0; + # https://bugzilla.redhat.com/show_bug.cgi?id=1439429 + assert_script_run "sed -i -e 's,enable_xauth=1,enable_xauth=0,g' /usr/bin/startx"; # run firefox directly in X as root. never do this, kids! type_string "startx /usr/bin/firefox -width 1024 -height 768 http://localhost:9090\n"; assert_screen "cockpit_login";