Merge lp://staging/~xnox/ubuntu/quantal/lvm2/merge95 into lp://staging/ubuntu/quantal/lvm2
Proposed by
Dimitri John Ledkov
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merge reported by: | Dimitri John Ledkov | ||||||||
| Merged at revision: | not available | ||||||||
| Proposed branch: | lp://staging/~xnox/ubuntu/quantal/lvm2/merge95 | ||||||||
| Merge into: | lp://staging/ubuntu/quantal/lvm2 | ||||||||
| Diff against target: |
85158 lines (+39300/-20331) 513 files modified
.pc/applied-patches (+0/-7) .pc/avoid-dev-block.patch/lib/device/dev-cache.c (+0/-976) .pc/dirs.patch/daemons/dmeventd/Makefile.in (+108/-0) .pc/dirs.patch/daemons/dmeventd/dmeventd.c (+2009/-0) .pc/dirs.patch/doc/example.conf.in (+0/-662) .pc/dirs.patch/lib/commands/toolcontext.c (+0/-1513) .pc/dm-event-api.patch/daemons/dmeventd/.exported_symbols (+4/-0) .pc/dm-event-api.patch/daemons/dmeventd/dmeventd.c (+2018/-0) .pc/dm-event-api.patch/daemons/dmeventd/libdevmapper-event.c (+874/-0) .pc/force-modprobe.patch/configure.in (+0/-1369) .pc/implicit-pointer.patch/tools/lvm.c (+0/-253) .pc/install.patch/daemons/dmeventd/plugins/lvm2/Makefile.in (+31/-0) .pc/install.patch/daemons/dmeventd/plugins/mirror/Makefile.in (+37/-0) .pc/install.patch/daemons/dmeventd/plugins/raid/Makefile.in (+36/-0) .pc/install.patch/daemons/dmeventd/plugins/snapshot/Makefile.in (+33/-0) .pc/install.patch/daemons/dmeventd/plugins/thin/Makefile.in (+36/-0) .pc/install.patch/make.tmpl.in (+0/-396) .pc/libs-cleanup.patch/configure.in (+0/-1423) .pc/monitoring-default-off.patch/doc/example.conf.in (+773/-0) .pc/monitoring-default-off.patch/lib/config/defaults.h (+0/-165) .pc/monitoring-default-off.patch/tools/toollib.c (+1637/-0) Makefile.in (+14/-7) VERSION (+1/-1) VERSION_DM (+1/-1) WHATS_NEW (+273/-1) WHATS_NEW_DM (+109/-0) configure (+391/-118) configure.in (+158/-17) daemons/Makefile.in (+8/-4) daemons/clvmd/Makefile.in (+4/-2) daemons/clvmd/clvm.h (+11/-4) daemons/clvmd/clvmd-cman.c (+1/-0) daemons/clvmd/clvmd-command.c (+44/-47) daemons/clvmd/clvmd-comms.h (+2/-1) daemons/clvmd/clvmd-corosync.c (+61/-2) daemons/clvmd/clvmd-openais.c (+1/-0) daemons/clvmd/clvmd-singlenode.c (+51/-24) daemons/clvmd/clvmd.c (+158/-103) daemons/clvmd/lvm-functions.c (+78/-74) daemons/clvmd/lvm-functions.h (+1/-1) daemons/clvmd/refresh_clvmd.c (+27/-24) daemons/cmirrord/clogd.c (+17/-5) daemons/cmirrord/cluster.c (+120/-25) daemons/cmirrord/functions.c (+25/-8) daemons/dmeventd/.exported_symbols (+3/-3) daemons/dmeventd/Makefile.in (+5/-4) daemons/dmeventd/dmeventd.c (+165/-133) daemons/dmeventd/dmeventd.h (+1/-0) daemons/dmeventd/libdevmapper-event.c (+38/-30) daemons/dmeventd/libdevmapper-event.h (+3/-0) daemons/dmeventd/plugins/Makefile.in (+6/-1) daemons/dmeventd/plugins/lvm2/.exported_symbols (+1/-0) daemons/dmeventd/plugins/lvm2/Makefile.in (+3/-5) daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c (+25/-4) daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h (+3/-0) daemons/dmeventd/plugins/mirror/Makefile.in (+3/-4) daemons/dmeventd/plugins/mirror/dmeventd_mirror.c (+16/-26) daemons/dmeventd/plugins/raid/Makefile.in (+2/-4) daemons/dmeventd/plugins/raid/dmeventd_raid.c (+30/-3) daemons/dmeventd/plugins/snapshot/Makefile.in (+3/-4) daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c (+60/-38) daemons/dmeventd/plugins/thin/.exported_symbols (+3/-0) daemons/dmeventd/plugins/thin/Makefile.in (+37/-0) daemons/dmeventd/plugins/thin/dmeventd_thin.c (+288/-0) daemons/lvmetad/Makefile.in (+59/-0) daemons/lvmetad/lvmetad-client.h (+81/-0) daemons/lvmetad/lvmetad-core.c (+1126/-0) daemons/lvmetad/test.sh (+16/-0) daemons/lvmetad/testclient.c (+127/-0) debian/changelog (+118/-0) debian/clvm.init (+6/-4) debian/clvmd.ra (+2/-2) debian/control (+22/-10) debian/dmeventd.install (+2/-0) debian/libdevmapper-dev.install (+2/-5) debian/libdevmapper-event1.02.1.install (+1/-1) debian/libdevmapper-event1.02.1.symbols (+6/-6) debian/libdevmapper1.02.1.install (+1/-1) debian/libdevmapper1.02.1.symbols (+66/-0) debian/liblvm2app2.2.install (+1/-1) debian/liblvm2cmd2.02.install (+1/-1) debian/lvm2.init (+6/-6) debian/lvm2.postinst (+4/-3) debian/lvm2.postrm (+9/-0) debian/lvm2.preinst (+4/-0) debian/patches/dirs.patch (+35/-4) debian/patches/dm-event-api.patch (+115/-0) debian/patches/install.patch (+83/-8) debian/patches/libs-cleanup.patch (+5/-13) debian/patches/monitoring-default-off.patch (+50/-12) debian/patches/series (+1/-0) debian/rules (+55/-43) doc/example.conf.in (+118/-7) doc/kernel/crypt.txt (+76/-0) doc/kernel/delay.txt (+26/-0) doc/kernel/flakey.txt (+53/-0) doc/kernel/io.txt (+75/-0) doc/kernel/kcopyd.txt (+47/-0) doc/kernel/linear.txt (+61/-0) doc/kernel/log.txt (+54/-0) doc/kernel/persistent-data.txt (+84/-0) doc/kernel/queue-length.txt (+39/-0) doc/kernel/raid.txt (+108/-0) doc/kernel/service-time.txt (+91/-0) doc/kernel/snapshot.txt (+168/-0) doc/kernel/striped.txt (+58/-0) doc/kernel/thin-provisioning.txt (+285/-0) doc/kernel/uevent.txt (+97/-0) doc/kernel/zero.txt (+37/-0) doc/lvm2-raid.txt (+197/-20) doc/lvm_fault_handling.txt (+41/-60) doc/lvmetad_design.txt (+2/-2) doc/tagging.txt (+6/-6) doc/udev_assembly.txt (+2/-2) include/.symlinks.in (+5/-0) lib/Makefile.in (+17/-1) lib/activate/activate.c (+395/-132) lib/activate/activate.h (+30/-12) lib/activate/dev_manager.c (+430/-57) lib/activate/dev_manager.h (+12/-1) lib/activate/fs.c (+22/-11) lib/activate/fs.h (+1/-0) lib/cache/lvmcache.c (+433/-54) lib/cache/lvmcache.h (+68/-49) lib/cache/lvmetad.c (+717/-0) lib/cache/lvmetad.h (+126/-0) lib/commands/toolcontext.c (+152/-95) lib/commands/toolcontext.h (+11/-4) lib/config/config.c (+266/-1207) lib/config/config.h (+21/-89) lib/config/defaults.h (+19/-5) lib/datastruct/str_list.c (+3/-6) lib/datastruct/str_list.h (+2/-2) lib/device/dev-cache.c (+87/-45) lib/device/dev-cache.h (+3/-0) lib/device/dev-io.c (+7/-20) lib/display/display.c (+105/-23) lib/filters/filter-mpath.c (+213/-0) lib/filters/filter-mpath.h (+23/-0) lib/filters/filter-persistent.c (+21/-15) lib/filters/filter-persistent.h (+1/-1) lib/filters/filter-regex.c (+14/-13) lib/filters/filter-regex.h (+1/-1) lib/filters/filter-sysfs.c (+3/-1) lib/filters/filter.c (+48/-21) lib/filters/filter.h (+2/-1) lib/format1/disk-rep.c (+48/-24) lib/format1/format1.c (+42/-12) lib/format1/import-extents.c (+4/-4) lib/format1/lvm1-label.c (+5/-6) lib/format_pool/disk_rep.c (+106/-76) lib/format_pool/format_pool.c (+34/-5) lib/format_pool/import_export.c (+4/-4) lib/format_text/archive.c (+1/-1) lib/format_text/archiver.c (+27/-11) lib/format_text/export.c (+33/-11) lib/format_text/flags.c (+9/-3) lib/format_text/format-text.c (+191/-186) lib/format_text/format-text.h (+12/-0) lib/format_text/import-export.h (+8/-7) lib/format_text/import.c (+16/-15) lib/format_text/import_vsn1.c (+150/-141) lib/format_text/layout.h (+1/-11) lib/format_text/tags.c (+3/-3) lib/format_text/text_export.h (+2/-2) lib/format_text/text_import.h (+3/-3) lib/format_text/text_label.c (+117/-94) lib/label/label.c (+16/-22) lib/label/label.h (+2/-0) lib/locking/cluster_locking.c (+36/-30) lib/locking/external_locking.c (+1/-1) lib/locking/file_locking.c (+15/-7) lib/locking/locking.c (+61/-9) lib/locking/locking.h (+27/-7) lib/locking/no_locking.c (+2/-2) lib/log/log.c (+8/-8) lib/metadata/lv.c (+209/-27) lib/metadata/lv.h (+11/-1) lib/metadata/lv_alloc.h (+7/-4) lib/metadata/lv_manip.c (+693/-255) lib/metadata/merge.c (+127/-2) lib/metadata/metadata-exported.h (+123/-87) lib/metadata/metadata.c (+282/-191) lib/metadata/metadata.h (+50/-46) lib/metadata/mirror.c (+144/-93) lib/metadata/pv.c (+72/-45) lib/metadata/pv_manip.c (+8/-6) lib/metadata/pv_map.c (+3/-3) lib/metadata/pv_map.h (+2/-2) lib/metadata/raid_manip.c (+654/-22) lib/metadata/replicator_manip.c (+0/-8) lib/metadata/segtype.h (+19/-16) lib/metadata/snapshot_manip.c (+4/-0) lib/metadata/thin_manip.c (+425/-0) lib/metadata/vg.c (+22/-3) lib/metadata/vg.h (+5/-0) lib/mirror/mirrored.c (+37/-38) lib/misc/configure.h.in (+15/-0) lib/misc/lvm-exec.c (+3/-2) lib/misc/lvm-file.c (+2/-1) lib/misc/lvm-globals.c (+14/-3) lib/misc/lvm-globals.h (+3/-0) lib/misc/lvm-percent.h (+2/-1) lib/misc/lvm-string.c (+43/-284) lib/misc/lvm-string.h (+0/-34) lib/misc/sharedlib.c (+4/-2) lib/mm/memlock.c (+23/-22) lib/raid/.exported_symbols (+1/-1) lib/raid/raid.c (+115/-81) lib/replicator/replicator.c (+39/-35) lib/report/columns.h (+12/-1) lib/report/properties.c (+39/-3) lib/report/properties.h (+1/-1) lib/report/report.c (+244/-16) lib/snapshot/snapshot.c (+10/-8) lib/striped/striped.c (+13/-11) lib/thin/.exported_symbols (+1/-0) lib/thin/Makefile.in (+25/-0) lib/thin/thin.c (+601/-0) lib/unknown/unknown.c (+9/-7) libdaemon/Makefile.in (+29/-0) libdaemon/client/Makefile.in (+20/-0) libdaemon/client/daemon-client.c (+118/-0) libdaemon/client/daemon-client.h (+105/-0) libdaemon/client/daemon-shared.c (+141/-0) libdaemon/client/daemon-shared.h (+30/-0) libdaemon/server/Makefile.in (+22/-0) libdaemon/server/daemon-server.c (+523/-0) libdaemon/server/daemon-server.h (+122/-0) libdm/Makefile.in (+1/-0) libdm/ioctl/libdm-iface.c (+220/-126) libdm/ioctl/libdm-targets.h (+3/-0) libdm/libdevmapper.h (+325/-4) libdm/libdm-common.c (+760/-104) libdm/libdm-common.h (+17/-4) libdm/libdm-config.c (+1174/-0) libdm/libdm-deptree.c (+1011/-386) libdm/libdm-file.c (+20/-1) libdm/libdm-report.c (+3/-0) libdm/libdm-string.c (+272/-13) libdm/misc/dm-log-userspace.h (+25/-6) libdm/mm/dbg_malloc.c (+16/-8) libdm/mm/dbg_malloc.h (+0/-46) libdm/mm/pool-fast.c (+13/-2) libdm/mm/pool.c (+1/-0) libdm/regex/matcher.c (+108/-68) liblvm/Makefile.in (+3/-1) liblvm/lvm2app.h (+2/-1) liblvm/lvm_base.c (+1/-1) liblvm/lvm_lv.c (+15/-9) liblvm/lvm_pv.c (+5/-5) make.tmpl.in (+40/-30) man/Makefile.in (+4/-4) man/clvmd.8.in (+14/-0) man/dmeventd.8.in (+22/-13) man/dmsetup.8.in (+472/-258) man/fsadm.8.in (+59/-45) man/lvconvert.8.in (+42/-0) man/lvcreate.8.in (+196/-108) man/lvextend.8.in (+1/-0) man/lvm.8.in (+2/-1) man/lvm.conf.5.in (+16/-4) man/lvreduce.8.in (+43/-31) man/lvremove.8.in (+15/-9) man/lvrename.8.in (+17/-23) man/lvresize.8.in (+56/-52) man/lvs.8.in (+68/-33) man/pvcreate.8.in (+1/-1) man/pvscan.8.in (+19/-0) scripts/Makefile.in (+20/-2) scripts/dm_event_systemd_red_hat.service.in (+3/-1) scripts/fsadm.sh (+51/-46) scripts/gdbinit (+68/-43) scripts/lvm2_lvmetad_init_red_hat.in (+115/-0) scripts/lvm2_lvmetad_systemd_red_hat.service.in (+17/-0) scripts/lvm2_lvmetad_systemd_red_hat.socket.in (+10/-0) scripts/lvm2_monitoring_init_red_hat.in (+4/-4) scripts/lvm2_monitoring_init_rhel4 (+4/-4) scripts/lvm2_monitoring_systemd_red_hat.service.in (+1/-2) scripts/lvm2_tmpfiles_red_hat.conf.in (+2/-0) scripts/lvm2create_initrd/lvm2create_initrd (+3/-3) scripts/lvm2create_initrd/lvm2create_initrd.8 (+53/-44) scripts/lvm2create_initrd/lvm2create_initrd.pod (+5/-5) scripts/vgimportclone.sh (+7/-5) test/Makefile.in (+46/-40) test/api/Makefile.in (+15/-34) test/api/percent.sh (+2/-0) test/lib/aux.sh (+75/-11) test/lib/check.sh (+4/-4) test/lib/harness.c (+20/-9) test/lib/test.sh (+12/-3) test/shell/000-basic.sh (+28/-0) test/shell/activate-missing.sh (+87/-0) test/shell/activate-partial.sh (+30/-0) test/shell/clvmd-restart.sh (+53/-0) test/shell/covercmd.sh (+82/-0) test/shell/dmeventd-restart.sh (+42/-0) test/shell/dumpconfig.sh (+35/-0) test/shell/fsadm.sh (+128/-0) test/shell/inconsistent-metadata.sh (+78/-0) test/shell/listings.sh (+83/-0) test/shell/lock-blocking.sh (+41/-0) test/shell/lvchange-mirror.sh (+28/-0) test/shell/lvconvert-mirror-basic-0.sh (+12/-0) test/shell/lvconvert-mirror-basic-1.sh (+12/-0) test/shell/lvconvert-mirror-basic-2.sh (+12/-0) test/shell/lvconvert-mirror-basic-3.sh (+12/-0) test/shell/lvconvert-mirror-basic.sh (+143/-0) test/shell/lvconvert-mirror.sh (+259/-0) test/shell/lvconvert-raid.sh (+215/-0) test/shell/lvconvert-repair-dmeventd.sh (+26/-0) test/shell/lvconvert-repair-policy.sh (+91/-0) test/shell/lvconvert-repair-replace.sh (+93/-0) test/shell/lvconvert-repair-snapshot.sh (+27/-0) test/shell/lvconvert-repair-transient-dmeventd.sh (+27/-0) test/shell/lvconvert-repair-transient.sh (+26/-0) test/shell/lvconvert-repair.sh (+114/-0) test/shell/lvconvert-twostep.sh (+26/-0) test/shell/lvcreate-large.sh (+40/-0) test/shell/lvcreate-mirror.sh (+41/-0) test/shell/lvcreate-operation.sh (+43/-0) test/shell/lvcreate-pvtags.sh (+47/-0) test/shell/lvcreate-raid.sh (+95/-0) test/shell/lvcreate-repair.sh (+100/-0) test/shell/lvcreate-small-snap.sh (+30/-0) test/shell/lvcreate-striped-mirror.sh (+65/-0) test/shell/lvcreate-thin.sh (+216/-0) test/shell/lvcreate-usage.sh (+152/-0) test/shell/lvextend-percent-extents.sh (+106/-0) test/shell/lvextend-snapshot-dmeventd.sh (+62/-0) test/shell/lvextend-snapshot-policy.sh (+47/-0) test/shell/lvm-init.sh (+21/-0) test/shell/lvmcache-exercise.sh (+22/-0) test/shell/lvmetad-pvs.sh (+20/-0) test/shell/lvresize-mirror.sh (+38/-0) test/shell/lvresize-rounding.sh (+25/-0) test/shell/lvresize-usage.sh (+20/-0) test/shell/mdata-strings.sh (+39/-0) test/shell/metadata-balance.sh (+232/-0) test/shell/metadata-dirs.sh (+43/-0) test/shell/metadata.sh (+80/-0) test/shell/mirror-names.sh (+156/-0) test/shell/mirror-vgreduce-removemissing.sh (+424/-0) test/shell/name-mangling.sh (+230/-0) test/shell/nomda-missing.sh (+83/-0) test/shell/pool-labels.sh (+40/-0) test/shell/pv-duplicate.sh (+25/-0) test/shell/pv-min-size.sh (+31/-0) test/shell/pv-range-overflow.sh (+32/-0) test/shell/pvchange-usage.sh (+66/-0) test/shell/pvcreate-metadata0.sh (+32/-0) test/shell/pvcreate-operation-md.sh (+147/-0) test/shell/pvcreate-operation.sh (+121/-0) test/shell/pvcreate-usage.sh (+192/-0) test/shell/pvmove-basic.sh (+385/-0) test/shell/pvremove-usage.sh (+68/-0) test/shell/read-ahead.sh (+62/-0) test/shell/snapshot-autoumount-dmeventd.sh (+39/-0) test/shell/snapshot-merge.sh (+134/-0) test/shell/snapshots-of-mirrors.sh (+44/-0) test/shell/tags.sh (+74/-0) test/shell/test-partition.sh (+30/-0) test/shell/topology-support.sh (+106/-0) test/shell/unknown-segment.sh (+34/-0) test/shell/unlost-pv.sh (+38/-0) test/shell/vgcfgbackup-usage.sh (+54/-0) test/shell/vgchange-maxlv.sh (+31/-0) test/shell/vgchange-sysinit.sh (+51/-0) test/shell/vgchange-usage.sh (+44/-0) test/shell/vgcreate-usage.sh (+163/-0) test/shell/vgextend-restoremissing.sh (+30/-0) test/shell/vgextend-usage.sh (+129/-0) test/shell/vgimportclone.sh (+38/-0) test/shell/vgmerge-operation.sh (+81/-0) test/shell/vgmerge-usage.sh (+67/-0) test/shell/vgreduce-removemissing-snapshot.sh (+26/-0) test/shell/vgreduce-usage.sh (+87/-0) test/shell/vgrename-usage.sh (+41/-0) test/shell/vgsplit-operation.sh (+295/-0) test/shell/vgsplit-stacked.sh (+29/-0) test/shell/vgsplit-usage.sh (+168/-0) test/t-000-basic.sh (+0/-30) test/t-activate-missing.sh (+0/-87) test/t-activate-partial.sh (+0/-30) test/t-covercmd.sh (+0/-82) test/t-dmeventd-restart.sh (+0/-40) test/t-fsadm.sh (+0/-123) test/t-inconsistent-metadata.sh (+0/-75) test/t-listings.sh (+0/-83) test/t-lock-blocking.sh (+0/-41) test/t-lvchange-mirror.sh (+0/-28) test/t-lvconvert-mirror-basic-0.sh (+0/-12) test/t-lvconvert-mirror-basic-1.sh (+0/-12) test/t-lvconvert-mirror-basic-2.sh (+0/-12) test/t-lvconvert-mirror-basic-3.sh (+0/-12) test/t-lvconvert-mirror-basic.sh (+0/-142) test/t-lvconvert-mirror.sh (+0/-255) test/t-lvconvert-raid.sh (+0/-158) test/t-lvconvert-repair-dmeventd.sh (+0/-26) test/t-lvconvert-repair-policy.sh (+0/-91) test/t-lvconvert-repair-replace.sh (+0/-93) test/t-lvconvert-repair-snapshot.sh (+0/-27) test/t-lvconvert-repair-transient-dmeventd.sh (+0/-27) test/t-lvconvert-repair-transient.sh (+0/-26) test/t-lvconvert-repair.sh (+0/-108) test/t-lvconvert-twostep.sh (+0/-26) test/t-lvcreate-mirror.sh (+0/-41) test/t-lvcreate-operation.sh (+0/-43) test/t-lvcreate-pvtags.sh (+0/-45) test/t-lvcreate-raid.sh (+0/-113) test/t-lvcreate-repair.sh (+0/-97) test/t-lvcreate-small-snap.sh (+0/-30) test/t-lvcreate-usage.sh (+0/-152) test/t-lvextend-percent-extents.sh (+0/-106) test/t-lvextend-snapshot-dmeventd.sh (+0/-51) test/t-lvextend-snapshot-policy.sh (+0/-47) test/t-lvm-init.sh (+0/-21) test/t-lvmcache-exercise.sh (+0/-23) test/t-lvresize-mirror.sh (+0/-38) test/t-lvresize-usage.sh (+0/-20) test/t-mdata-strings.sh (+0/-33) test/t-metadata-balance.sh (+0/-232) test/t-metadata-dirs.sh (+0/-43) test/t-metadata.sh (+0/-80) test/t-mirror-names.sh (+0/-156) test/t-mirror-vgreduce-removemissing.sh (+0/-424) test/t-nomda-missing.sh (+0/-83) test/t-pool-labels.sh (+0/-39) test/t-pv-duplicate.sh (+0/-25) test/t-pv-min-size.sh (+0/-31) test/t-pv-range-overflow.sh (+0/-32) test/t-pvchange-usage.sh (+0/-66) test/t-pvcreate-metadata0.sh (+0/-32) test/t-pvcreate-operation-md.sh (+0/-147) test/t-pvcreate-operation.sh (+0/-121) test/t-pvcreate-usage.sh (+0/-192) test/t-pvmove-basic.sh (+0/-378) test/t-pvremove-usage.sh (+0/-68) test/t-read-ahead.sh (+0/-62) test/t-snapshot-autoumount-dmeventd.sh (+0/-39) test/t-snapshot-merge.sh (+0/-133) test/t-snapshots-of-mirrors.sh (+0/-44) test/t-tags.sh (+0/-74) test/t-test-partition.sh (+0/-30) test/t-topology-support.sh (+0/-106) test/t-unknown-segment.sh (+0/-34) test/t-unlost-pv.sh (+0/-38) test/t-vgcfgbackup-usage.sh (+0/-54) test/t-vgchange-maxlv.sh (+0/-31) test/t-vgchange-sysinit.sh (+0/-51) test/t-vgchange-usage.sh (+0/-44) test/t-vgcreate-usage.sh (+0/-163) test/t-vgextend-restoremissing.sh (+0/-30) test/t-vgextend-usage.sh (+0/-129) test/t-vgimportclone.sh (+0/-36) test/t-vgmerge-operation.sh (+0/-81) test/t-vgmerge-usage.sh (+0/-67) test/t-vgreduce-removemissing-snapshot.sh (+0/-26) test/t-vgreduce-usage.sh (+0/-87) test/t-vgrename-usage.sh (+0/-41) test/t-vgsplit-operation.sh (+0/-290) test/t-vgsplit-stacked.sh (+0/-29) test/t-vgsplit-usage.sh (+0/-168) test/unit/Makefile.in (+33/-0) test/unit/bitset_t.c (+133/-0) test/unit/config_t.c (+156/-0) test/unit/matcher_data.h (+1013/-0) test/unit/matcher_t.c (+85/-0) test/unit/run.c (+29/-0) test/unit/string_t.c (+83/-0) tools/Makefile.in (+2/-4) tools/args.h (+7/-2) tools/commands.h (+16/-7) tools/dmsetup.c (+378/-71) tools/dumpconfig.c (+1/-1) tools/lvchange.c (+45/-17) tools/lvconvert.c (+144/-23) tools/lvcreate.c (+582/-156) tools/lvm.c (+1/-2) tools/lvm2cmd.h (+6/-0) tools/lvmcmdlib.c (+4/-0) tools/lvmcmdline.c (+28/-16) tools/lvmdiskscan.c (+7/-4) tools/lvrename.c (+15/-0) tools/lvresize.c (+128/-31) tools/polldaemon.c (+24/-7) tools/polldaemon.h (+3/-3) tools/pvchange.c (+1/-1) tools/pvck.c (+1/-1) tools/pvcreate.c (+3/-3) tools/pvmove.c (+32/-29) tools/pvremove.c (+9/-6) tools/pvresize.c (+1/-1) tools/pvscan.c (+146/-7) tools/reporter.c (+3/-0) tools/toollib.c (+57/-39) tools/toollib.h (+0/-1) tools/tools.h (+3/-0) tools/vgcfgbackup.c (+1/-1) tools/vgcfgrestore.c (+2/-0) tools/vgchange.c (+17/-10) tools/vgconvert.c (+1/-5) tools/vgcreate.c (+2/-0) tools/vgmerge.c (+2/-1) tools/vgreduce.c (+4/-4) tools/vgremove.c (+1/-1) tools/vgrename.c (+8/-3) tools/vgscan.c (+8/-1) tools/vgsplit.c (+16/-3) udev/13-dm-disk.rules (+0/-27) udev/13-dm-disk.rules.in (+38/-0) udev/69-dm-lvm-metad.rules (+25/-0) udev/Makefile.in (+12/-2) |
||||||||
| To merge this branch: | bzr merge lp://staging/~xnox/ubuntu/quantal/lvm2/merge95 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Needs Fixing | ||
| Kees Cook | Pending | ||
| Canonical Foundations Team | Pending | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
* Debian accepted some of the event manager packaging
* Debian multiarched libdevmapper libs, but not the libdevmapper-dev
* Ubuntu's "Don't install documentation in udebs" vanished and there are no traces of it
* Ubuntu's "don't ship lvm2 init script" transformed into "don't ship clvm init script" see bug 1037033
* I added libdevmapper-dev multiarching
* It looks like Debian refreshed api patch, which is now different to Ubuntu's. Since the 'new' api was only in quantal so far, I am tempted to switch for Debian's API instead & recompile. See $ bzr log -p debian/*.symbols
The rest stayed the same.
To post a comment you must log in.
Revision history for this message
| Dimitri John Ledkov (xnox) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
> - debian/
> - create /var/run/lvm if it doesn't exist.
debian/rules now points at /run/lvm; this should be updated to match.
--- debian/
+++ debian/
@@ -1,5 +1,2 @@
-usr/include/
-usr/include/
-usr/lib/
-usr/lib/
-usr/lib/
+usr/include/
+usr/lib/
Hmm, good catch. I think you should call this out as a separate change in the changelog, since this isn't just a "remaining change" but a fix to multiarch support for the runtime lib package.
--- debian/
+++ debian/
@@ -5,7 +5,9 @@
case "$1" in
configure)
- invoke-rc.d lvm2 start || :
+ if [ -x /etc/init.d/lvm2 ]; then
+ invoke-rc.d lvm2 start || :
+ fi
if [ -x /usr/sbin/
fi
Since the lvm2.init is being dropped, this probably shouldn't be conditional - it should probably be removed entirely. In fact, when this regression was introduced during the lucid merge, the previous postinst was doing this:
if test -f /etc/init.d/lvm2; then
update-rc.d -f lvm2 remove >/dev/null 2>&1 || true
rm -f /etc/init.d/lvm2
fi
We probably want to be doing that again, possibly with better handling of modified conffiles.
BTW, perhaps it's worth checking with Kees to see if there was a reason he thought this init script should be restored when merging.
--- debian/
+++ debian/
@@ -1,11 +1,13 @@
libdevmapper-
Base@Base 2:1.02.20
- daemon_talk@Base 2:1.02.67
+ dm_event_
+ dm_event_
+ dm_event_
This is unfortunate, but it happens... In this case, it appears that dmeventd used the old symbol, so we want to have a Breaks against the old version of dmeventd. No other packages in Ubuntu that depend on libdevmapper-
- dm_event_
+ dm_event_
dm_event_
dm_event_
- dm_event_
+ dm_event_
Those version bumps are unnecessary in Ubuntu, but mostly harmless.
@@ -22,5 +24,3 @@
dm_event_
dm_event_
dm_event_
- fini_fifos@Base 2:1.02.67
- init_fifos@Base 2:1.02.67
These symbols are also only used by dmeventd. (This makes sense, as all three symbols appear to be due to a Debian-specific patch for dmeventd.)
The rest looks good to me.