Fix Anaconda startup on Live media via custom webview launcher script #4854
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| set -eu | ||
|
|
||
| # exec_prefix= is set because the default /usr/libexec contains "${exec_prefix}" | ||
| exec_prefix="/usr" |
Check warning
Code scanning / shellcheck
exec_prefix appears unused. Verify use (or export if used externally).
|
|
||
| # exec_prefix= is set because the default /usr/libexec contains "${exec_prefix}" | ||
| exec_prefix="/usr" | ||
| libexecdir="/usr/libexec" |
Check warning
Code scanning / shellcheck
libexecdir appears unused. Verify use (or export if used externally).
|
|
||
| # 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 |
Check warning
Code scanning / shellcheck
Use single quotes, otherwise this expands now rather than when signalled.
|
|
||
| # 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 |
Check warning
Code scanning / shellcheck
Use single quotes, otherwise this expands now rather than when signalled.
M4rtinK
changed the title
| @@ -57,6 +58,7 @@ install-data-hook: $(WEBPACK_TEST) | |||
| cp -r dist/* $(DESTDIR)/usr/share/cockpit/$(PACKAGE_NAME) | |||
| mkdir -p $(DESTDIR)/usr/share/metainfo/ | |||
| cp org.cockpit-project.$(PACKAGE_NAME).metainfo.xml $(DESTDIR)/usr/share/metainfo/ | |||
| cp webui-desktop $(DESTDIR)/usr/libexec/ | |||
There was a problem hiding this comment.
Shouldn't this go to /usr/libexec/anaconda/ instead?
There was a problem hiding this comment.
This is just a re-revert of working code - I suggest we handle non-critical improvements in separate PR.
tests/shellcheck/ignores.sh
Outdated
| @@ -5,4 +5,5 @@ ignore_patterns=( | |||
| dockerfile/ | |||
| scripts/ | |||
| widgets/ | |||
| webui-desktop # This is just a temporary file, to be replaced with cockpit-desktop once 'unshare' is not filtered out by lorax | |||
There was a problem hiding this comment.
Reasoning is wrong, unshare is now present
weldr/lorax#1222
There was a problem hiding this comment.
Updated the reasoning.
So I have this in the first commit message:
As for why it does not work - we have not investigated further so far. It was actually the Image Builder team finding out it start to work if we drop the unshare command from the |
M4rtinK
force-pushed
the
master-webui_hotfix_cockpit_desktop
branch
from
d2612e3
to
2b17655
Compare
|
Updated the PR. |
|
@martinpitt @allisonkarlitskaya @ondrejbudai @supakeen So basically during early Image Builder built Live image we found out the Anaconda Web UI won't start as long as |
…d of cockpit-desktop"" This reverts commit 94325bc. Unfortunately it turns out the unshare command prevents the Web UI from being started on Live images, so we need to put this temporary hotfix back in.
Taken from cockpit-294.1-2.fc39, minus the unshare invocation.
M4rtinK
force-pushed
the
master-webui_hotfix_cockpit_desktop
branch
from
2b17655
to
996b0a2
Compare
|
/kickstart-test --testtype smoke |
|
Feel free to ignore these issues:
|
This should fix the startup on Live images for now.
The first commit reverts the revert & switches Anaconda to again use the custom version of cockpit-desktop, called webui-desktop.
The second commit updates the script to the version found in the latest cockpit-ws package.