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

giuseppe/reboot-after-upgrade #175

Merged
merged 8 commits into from
Oct 8, 2015

Conversation

giuseppe
Copy link
Contributor

@giuseppe giuseppe commented Oct 5, 2015

No description provided.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@@ -91,10 +91,12 @@
</method>

<method name="Rollback">
<arg type="a{sv}" name="options" direction="in"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest adding an XML comment here that documents the various flags.

@mbarnes
Copy link
Contributor

mbarnes commented Oct 5, 2015

So the rpmostree command doesn't appear to be passing the opt_reboot flag to the daemon for either method, and is still rebooting from the client-side. Is that intentional? I expected to see the client-side reboot logic removed.

@giuseppe
Copy link
Contributor Author

giuseppe commented Oct 5, 2015

yes, the rpm-ostree program is not using the new reboot flag because it has some logic between the upgrade/rollback and the reboot. I'll amend the other changes and submit an updated version

@giuseppe
Copy link
Contributor Author

giuseppe commented Oct 6, 2015

I have not refactored the reboot in a single function yet, as it is used both in rpm-ostree and in rpm-ostreed. Should it go in libglnx or in a common library used by rpm-ostree and rpm-ostreed?

@mbarnes
Copy link
Contributor

mbarnes commented Oct 6, 2015

I have not refactored the reboot in a single function yet, as it is used both in rpm-ostree and in rpm-ostreed. Should it go in libglnx or in a common library used by rpm-ostree and rpm-ostreed?

I'd say in the daemon since it requires root privilege. But I was also assuming the reboot calls would be removed from the command-line layer.

Looking there, I don't really see anything between rpmostree_transaction_get_response_sync() and handling --reboot (expect maybe where --check-diff is handled, but that in combination with --reboot should be rejected just after option parsing). Am I missing the logic you referred to?

@giuseppe
Copy link
Contributor Author

giuseppe commented Oct 6, 2015

thanks for the review. Yes I was referring to --check-diff. If it is fine to not allow --check-diff together with --reboot then it is all set and I can proceed with the refactoring.

@mbarnes
Copy link
Contributor

mbarnes commented Oct 6, 2015

Doesn't make much sense to me to print a package diff and then immediately reboot. @cgwalters, agree?

I think currently if --check-diff is given then --reboot is just ignored. But I'd prefer an error message.

@cgwalters
Copy link
Member

Yeah, seems like they should conflict.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Contributor Author

giuseppe commented Oct 8, 2015

I pushed some new commits

@mbarnes
Copy link
Contributor

mbarnes commented Oct 8, 2015

Looks great to me! 👍

cgwalters added a commit that referenced this pull request Oct 8, 2015
@cgwalters cgwalters merged commit 054ceeb into coreos:master Oct 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants