Zhou Zheng Sheng has uploaded a new change for review. Change subject: Packaging: Remove hard coded 12- prefix of vdsm-lvm.rules from upstream ......................................................................
Packaging: Remove hard coded 12- prefix of vdsm-lvm.rules from upstream vdsm-lvm.rules.in is to fix lvm block device permissions, it should be applied after the system default lvm rules. On RH family distributions, 12 is correct because system default is 11-dm-lvm.rules. On Ubuntu, 12 is incorrect and we use 61-vdsm.lvm.rules. This patch removes the 12-prefix from the upstream file name, and leaves the downstream packaging script to decide the correct installed name. Change-Id: I65ae0fa4d83bba0e1622f70d5c8bee0e2d8742dd Signed-off-by: Zhou Zheng Sheng <[email protected]> --- M .gitignore M configure.ac M vdsm.spec.in R vdsm/storage/vdsm-lvm.rules.in 4 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/19006/1 diff --git a/.gitignore b/.gitignore index c6a8584..295e1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -54,8 +54,8 @@ vdsm/mk_sysprep_floppy vdsm/mom.conf vdsm/sos/vdsm.py -vdsm/storage/12-vdsm-lvm.rules vdsm/storage/protect/safelease +vdsm/storage/vdsm-lvm.rules vdsm/sudoers.vdsm vdsm/svdsm.logger.conf vdsm/vdscli.py diff --git a/configure.ac b/configure.ac index 884cd07..fc3c8cb 100644 --- a/configure.ac +++ b/configure.ac @@ -233,10 +233,10 @@ vdsm/gluster/Makefile vdsm/netconf/Makefile vdsm/sos/Makefile - vdsm/storage/12-vdsm-lvm.rules vdsm/storage/Makefile vdsm/storage/imageRepository/Makefile vdsm/storage/protect/Makefile + vdsm/storage/vdsm-lvm.rules vdsm_api/Makefile vdsm_hooks/Makefile vdsm_hooks/checkimages/Makefile diff --git a/vdsm.spec.in b/vdsm.spec.in index 4613b13..a84748a 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -565,7 +565,7 @@ %{buildroot}%{_datadir}/%{vdsm_name}/respawn # Install the lvm rules -install -Dm 0644 vdsm/storage/12-vdsm-lvm.rules \ +install -Dm 0644 vdsm/storage/vdsm-lvm.rules \ %{buildroot}/lib/udev/rules.d/12-vdsm-lvm.rules install -Dm 0644 vdsm/limits.conf \ diff --git a/vdsm/storage/12-vdsm-lvm.rules.in b/vdsm/storage/vdsm-lvm.rules.in similarity index 100% rename from vdsm/storage/12-vdsm-lvm.rules.in rename to vdsm/storage/vdsm-lvm.rules.in -- To view, visit http://gerrit.ovirt.org/19006 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65ae0fa4d83bba0e1622f70d5c8bee0e2d8742dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
