Yaniv Bronhaim has uploaded a new change for review. Change subject: Removing flag for disabling chown hack in el6 ......................................................................
Removing flag for disabling chown hack in el6 We don't support el6 anymore - therefore this code is redundant for later versions. Change-Id: I2ea9e772e3facae12b6cc48e97d3cf157a2f32a3 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M configure.ac M vdsm.spec.in M vdsm/storage/vdsm_lvm_rules.template.in 3 files changed, 1 insertion(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/40711/1 diff --git a/configure.ac b/configure.ac index 9f29e07..4e6943a 100644 --- a/configure.ac +++ b/configure.ac @@ -78,17 +78,6 @@ AM_CONDITIONAL([KOJI], [test "${enable_koji}" = "yes"]) AC_ARG_ENABLE( - [chown_hack], - [AS_HELP_STRING( - [--enable-chown-hack], - [enable chown hack for lvm udev rules @<:@default=no@:>@] - )], - , - [enable_chown_hack="no"] -) -AC_SUBST([CHOWN_HACK], ["${enable_chown_hack}"]) - -AC_ARG_ENABLE( [libvirt-sanlock], [AS_HELP_STRING( [--disable-libvirt-sanlock], diff --git a/vdsm.spec.in b/vdsm.spec.in index a0891b5..bcbacc9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -58,10 +58,6 @@ %global with_systemd 1 %endif -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_chown_hack 1 -%endif - %if 0%{?rhel} == 6 %global _udevrulesdir /lib/udev/rules.d/ %global _udevexecdir /lib/udev/ @@ -741,7 +737,6 @@ autoreconf -if %endif %configure %{?with_hooks:--enable-hooks} \ - %{?with_chown_hack:--enable-chown-hack} \ %{rhev_build_config_opt} \ %if 0%{?rhev_build} --with-reg-bridge-name='rhevm' \ diff --git a/vdsm/storage/vdsm_lvm_rules.template.in b/vdsm/storage/vdsm_lvm_rules.template.in index 9184431..191d179 100644 --- a/vdsm/storage/vdsm_lvm_rules.template.in +++ b/vdsm/storage/vdsm_lvm_rules.template.in @@ -12,7 +12,6 @@ import sys write = sys.stdout.write -enable_chown_hack = "@CHOWN_HACK@" write("""\ # @@ -40,20 +39,14 @@ # Volumes used as vdsm images """) -if enable_chown_hack == "yes": - write("""\ +write("""\ # WARNING: we cannot use OWNER, GROUP and MODE since using any of them will # change the selinux label to the default, causing vms to pause after extending # disks. https://bugzilla.redhat.com/1147910 ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", RUN+="@CHOWN_PATH@ @VDSMUSER@:@QEMUGROUP@ $env{DEVNAME}", GOTO="lvm_end" """) -else: - write("""\ -ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", OWNER:="@VDSMUSER@", GROUP:="@QEMUGROUP@", GOTO="lvm_end" -""") write("""\ - # Other volumes used by vdsm ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]_MERGE", OWNER:="@VDSMUSER@", GROUP:="@QEMUGROUP@", GOTO="lvm_end" ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="_remove_me_[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9]_[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", OWNER:="@VDSMUSER@", GROUP:="@QEMUGROUP@", GOTO="lvm_end" -- To view, visit https://gerrit.ovirt.org/40711 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ea9e772e3facae12b6cc48e97d3cf157a2f32a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
