Fabian Deutsch has uploaded a new change for review. Change subject: hooks: Move sanlock upgrade hook to post-upgrade ......................................................................
hooks: Move sanlock upgrade hook to post-upgrade Previously the sanlock upgrade loogic was run on boot, and that broken vdsm's boot on el7/systemd based systems. Now the logic is run post-upgrade and not at boot time. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1156369 Change-Id: I53d63c393e884901eb45f1ac38e8bf2795dbaeb7 Signed-off-by: Fabian Deutsch <fabi...@fedoraproject.org> --- M hooks/Makefile.am R hooks/on-boot/02-vdsm-sebool-config R hooks/post-upgrade/01-sanlock-check M ovirt-node-plugin-vdsm.spec.in 4 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-plugin-vdsm refs/changes/42/34842/1 diff --git a/hooks/Makefile.am b/hooks/Makefile.am index 8497f25..5eb29fb 100644 --- a/hooks/Makefile.am +++ b/hooks/Makefile.am @@ -16,14 +16,18 @@ # also available at http://www.gnu.org/copyleft/gpl.html. preupgradedir = $(libexecdir)/ovirt-node/hooks/pre-upgrade +postupgradedir = $(libexecdir)/ovirt-node/hooks/post-upgrade onbootdir = $(libexecdir)/ovirt-node/hooks/on-boot dist_preupgrade_SCRIPTS = \ pre-upgrade/01-vdsm \ $(NULL) +dist_postupgrade_SCRIPTS = \ + post-upgrade/01-sanlock-check \ + $(NULL) + dist_onboot_SCRIPTS = \ on-boot/01-vdsm-configure \ - on-boot/02-sanlock-check \ - on-boot/03-vdsm-sebool-config \ + on-boot/02-vdsm-sebool-config \ $(NULL) diff --git a/hooks/on-boot/03-vdsm-sebool-config b/hooks/on-boot/02-vdsm-sebool-config similarity index 100% rename from hooks/on-boot/03-vdsm-sebool-config rename to hooks/on-boot/02-vdsm-sebool-config diff --git a/hooks/on-boot/02-sanlock-check b/hooks/post-upgrade/01-sanlock-check similarity index 100% rename from hooks/on-boot/02-sanlock-check rename to hooks/post-upgrade/01-sanlock-check diff --git a/ovirt-node-plugin-vdsm.spec.in b/ovirt-node-plugin-vdsm.spec.in index b2f8b8b..b9a4462 100644 --- a/ovirt-node-plugin-vdsm.spec.in +++ b/ovirt-node-plugin-vdsm.spec.in @@ -74,13 +74,16 @@ %files %{python_sitelib}/ovirt/node/setup/vdsm %{_libexecdir}/ovirt-node/hooks/pre-upgrade/01-vdsm +%{_libexecdir}/ovirt-node/hooks/post-upgrade/01-sanlock-check %{_libexecdir}/ovirt-node/hooks/on-boot/01-vdsm-configure -%{_libexecdir}/ovirt-node/hooks/on-boot/02-sanlock-check -%{_libexecdir}/ovirt-node/hooks/on-boot/03-vdsm-sebool-config +%{_libexecdir}/ovirt-node/hooks/on-boot/02-vdsm-sebool-config %{_sysconfdir}/ovirt-plugins.d %{_sysconfdir}/default/version.ovirt-node-plugin-vdsm %changelog +* Wed Nov 04 2014 Fabian Deutsch <fabi...@redhat.com> - 0.4.2 +- Move sanlock chek to post-upgrade hook rhbz#1156369 + * Thu Oct 23 2014 Fabian Deutsch <fabi...@redhat.com> - 0.4.1 - Add sebool handler rhbz#1150243 rhbz#1156038 -- To view, visit http://gerrit.ovirt.org/34842 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53d63c393e884901eb45f1ac38e8bf2795dbaeb7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node-plugin-vdsm Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <fabi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
