Douglas Schilling Landgraf has uploaded a new change for review. Change subject: Revert "persist: /etc/multipath/wwwids" ......................................................................
Revert "persist: /etc/multipath/wwwids" This reverts commit d9d9e760f622bc7173d5e83a75e136ac346cc92f. Change-Id: Icc41bb4a0c3c7a475447a3ea8e32b43649423777 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M hooks/Makefile.am D hooks/on-boot/03-persist-multipath-wwids D hooks/pre-upgrade/03-persist-multipath-wwids M ovirt-node-plugin-vdsm.spec.in 4 files changed, 0 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node-plugin-vdsm refs/changes/29/41129/1 diff --git a/hooks/Makefile.am b/hooks/Makefile.am index 62ab3f1..2d01579 100644 --- a/hooks/Makefile.am +++ b/hooks/Makefile.am @@ -21,7 +21,6 @@ dist_preupgrade_SCRIPTS = \ pre-upgrade/01-vdsm \ - on-boot/03-persist-multipath-wwids \ $(NULL) dist_postupgrade_SCRIPTS = \ @@ -31,6 +30,5 @@ dist_onboot_SCRIPTS = \ on-boot/01-vdsm-configure \ on-boot/02-vdsm-sebool-config \ - on-boot/03-persist-multipath-wwids \ on-boot/90-start-vdsm \ $(NULL) diff --git a/hooks/on-boot/03-persist-multipath-wwids b/hooks/on-boot/03-persist-multipath-wwids deleted file mode 100644 index e4bc9fe..0000000 --- a/hooks/on-boot/03-persist-multipath-wwids +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# 03-persist-multipath-wwids - Copyright (C) 2015 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -MULTIPATH_DIR="/etc/multipath" -WWIDS_PATH="${MULTIPATH_DIR}/wwids" - -if [ ! -f "/config${WWIDS_PATH}" ]; then - if [ ! -d "${MULTIPATH_DIR}" ]; then - mkdir ${MULTIPATH_DIR} - fi - touch ${WWIDS_PATH} - persist ${WWIDS_PATH} -fi diff --git a/hooks/pre-upgrade/03-persist-multipath-wwids b/hooks/pre-upgrade/03-persist-multipath-wwids deleted file mode 100644 index 3ab599e..0000000 --- a/hooks/pre-upgrade/03-persist-multipath-wwids +++ /dev/null @@ -1 +0,0 @@ -../on-boot/03-persist-multipath-wwids \ No newline at end of file diff --git a/ovirt-node-plugin-vdsm.spec.in b/ovirt-node-plugin-vdsm.spec.in index 0324427..e828e68 100644 --- a/ovirt-node-plugin-vdsm.spec.in +++ b/ovirt-node-plugin-vdsm.spec.in @@ -97,11 +97,9 @@ %license COPYING %{python_sitelib}/ovirt/node/setup/vdsm %{_libexecdir}/ovirt-node/hooks/pre-upgrade/01-vdsm -%{_libexecdir}/ovirt-node/hooks/pre-upgrade/03-persist-multipath-wwids %{_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-vdsm-sebool-config -%{_libexecdir}/ovirt-node/hooks/on-boot/03-persist-multipath-wwids %{_libexecdir}/ovirt-node/hooks/on-boot/90-start-vdsm %{_sysconfdir}/ovirt-plugins.d %{_sysconfdir}/default/version.ovirt-node-plugin-vdsm -- To view, visit https://gerrit.ovirt.org/41129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc41bb4a0c3c7a475447a3ea8e32b43649423777 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node-plugin-vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
