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: fix make rsync not updating the test VM #5026

Merged
merged 1 commit into from
Aug 8, 2023

Conversation

KKoukiou
Copy link
Contributor

@KKoukiou KKoukiou commented Aug 8, 2023

make rsync stores the new files in /usr/local/share/cockpit whilst the original files are in /usr/share/cockpit.

So the running session doesn't recognize the new
directory in /usr/local/, that'd require a bridge restart.

This is not possible to do as that makes anaconda think that user Quit the installation.

Copy link
Contributor

@M4rtinK M4rtinK left a comment

Choose a reason for hiding this comment

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

Looks good to me - if it fixes the current breakage, I'm fine with merging this.

@M4rtinK
Copy link
Contributor

M4rtinK commented Aug 8, 2023

make rsync stores the new files in /usr/local/share/cockpit whilst the original files are in /usr/share/cockpit.

Can't we make it so, that make rsync syncs into /usr/share/cockpit & overwrites the files there ?

Looks like the target path is controlled by this cockcpit maintained plugin: https://github.com/cockpit-project/cockpit/blob/c865f6a578c9039a82b2417f9fe559293b81d407/pkg/lib/cockpit-rsync-plugin.js#L41

So I guess we could teach the plugin to make the path configurable & set it in out build.js file ?

@KKoukiou
Copy link
Contributor Author

KKoukiou commented Aug 8, 2023

make rsync stores the new files in /usr/local/share/cockpit whilst the original files are in /usr/share/cockpit.

Can't we make it so, that make rsync syncs into /usr/share/cockpit & overwrites the files there ?

Looks like the target path is controlled by this cockcpit maintained plugin: https://github.com/cockpit-project/cockpit/blob/c865f6a578c9039a82b2417f9fe559293b81d407/pkg/lib/cockpit-rsync-plugin.js#L41

So I guess we could teach the plugin to make the path configurable & set it in out build.js file ?

sure but that will need change to cockpit repository. Can be follwup improvement?

@M4rtinK
Copy link
Contributor

M4rtinK commented Aug 8, 2023

sure but that will need change to cockpit repository. Can be follwup improvement?

Sure, I'm fine with this PR being a quick fix & proper solution being implemented as a followup. I'll also create a Jira issue to track the followup.

`make rsync` stores the new files in /usr/local/share/cockpit
whilst the original files are in /usr/share/cockpit.

So the running session doesn't recognize the new
directory in /usr/local/, that'd require a bridge restart.

This is not possible to do as that makes anaconda think that user Quit the
installation.
@KKoukiou
Copy link
Contributor Author

KKoukiou commented Aug 8, 2023

/kickstart-test --waive webui-only

@KKoukiou
Copy link
Contributor Author

KKoukiou commented Aug 8, 2023

The rest of failures are unrelated (dnf5 revert)

@KKoukiou KKoukiou removed the request for review from vojtechtrefny August 8, 2023 17:02
@KKoukiou KKoukiou merged commit bbbf830 into rhinstaller:master Aug 8, 2023
15 of 17 checks passed
@KKoukiou KKoukiou deleted the webui-rsync-fix branch August 8, 2023 17:04
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.

3 participants