Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webui: simplify webui-desktop script #4919

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

KKoukiou
Copy link
Contributor

Stop using coproc, nesting bash and calling unshare. All these are needed for the namespace isolation which we don't need in anaconda.

@KKoukiou
Copy link
Contributor Author

This fixes the crash but it seems that still the VM does not shutoff.

# start the bridge; this needs to run in the normal user session/namespace
coproc ${2:+ssh "$2"} cockpit-bridge
trap "kill $COPROC_PID; wait $COPROC_PID || true" EXIT INT QUIT PIPE
BROWSER="/usr/bin/firefox --kiosk"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I'm using this variable on my Firefox theme PR: https://github.com/rhinstaller/anaconda/pull/4918/files#diff-4384704581bd02e11beb389b584be16b175b80679194ac91422ed2701d8bd3bdR139

I wonder - now that we started changing it maybe this script is a better place for the theme handling than the UI handling Python code where I put it in my PR ? What do you think ?

We might have to solve live/boot.iso detection somehow, but otherwise it should work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it probably makes more sense that the theming gets applied here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so I'll adjust #4918 accordingly. :)

ui/webui/webui-desktop Fixed Show fixed Hide fixed
Copy link
Member

@jkonecny12 jkonecny12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is most of the time better. Thanks, I love this fix!

Copy link
Contributor

@rvykydal rvykydal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

Copy link
Contributor

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM (mostly), but it still seems to fail? Or is that unrelated?

# start the bridge; this needs to run in the normal user session/namespace
coproc ${2:+ssh "$2"} cockpit-bridge
trap "kill $COPROC_PID; wait $COPROC_PID || true" EXIT INT QUIT PIPE
BROWSER="/usr/bin/firefox --kiosk"

# start ws and browser in a detached network namespace
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is obsolete and wrong now.

Stop using coproc, nesting bash and calling unshare. All these are
needed for the namespace isolation which we don't need in anaconda.
@KKoukiou
Copy link
Contributor Author

fedora-rawhide-boot@bots#4976 is passing now.

@KKoukiou
Copy link
Contributor Author

/kickstart-test --waive webui only

@KKoukiou KKoukiou merged commit 75a8d9b into rhinstaller:master Jul 17, 2023
13 of 14 checks passed
@KKoukiou KKoukiou deleted the webui-desktop-simplify branch July 17, 2023 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

5 participants