diff --git a/lvm.conf b/lvm.conf index 7a89d79..e1fc956 100644 --- a/lvm.conf +++ b/lvm.conf @@ -275,7 +275,7 @@ log { # for syslog and lvm2_log_fn purposes. # Any 'yes' or 'no' questions not overridden by other arguments # are suppressed and default to 'no'. - silent = 1 + silent = 0 # Should we send log messages through syslog? # 1 is yes; 0 is no. @@ -421,7 +421,7 @@ global { # Type 3 uses built-in clustered locking. # Type 4 uses read-only locking which forbids any operations that might # change metadata. - locking_type = 3 + locking_type = 1 # Set to 0 to fail when a lock request cannot be satisfied immediately. wait_for_locks = 1 diff --git a/lvm2.changes b/lvm2.changes index ae1b4f0..10d603d 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 22 07:10:10 UTC 2014 - lwang@suse.com + +- delete lvm2-lvmetad.service from %service_add_pre/post and + %service_del_preun/postun to avoid lvm2-lvmetad.service running + when use_lvmetad=0. (bnc#901859) +- locking_type is set to 3(clustered lock) by default will output + warning message if cmirrord is not running. Set to 1 to be same + with upstream. (bnc#906710) +- Set silent default to 0 to avoid some commands have no output + and to be same with upstream. (bnc#888798) + ------------------------------------------------------------------- Mon Dec 8 21:19:13 UTC 2014 - jengelh@inai.de diff --git a/lvm2.spec b/lvm2.spec index a7e3e5a..6afb5ad 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -244,22 +244,22 @@ pushd thin-provisioning-tools-%{thin_provisioning_version} popd %pre -%service_add_pre blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service +%service_add_pre blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket %post /sbin/ldconfig %{?regenerate_initrd_post} -%service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service +%service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket %posttrans %{?regenerate_initrd_posttrans} %preun -%service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service lvm2-lvmetad.socket +%service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket %postun /sbin/ldconfig -%service_del_postun lvm2-lvmetad.service blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket +%service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket %files %defattr(-,root,root)