CVS commit: src/external/gpl2/lvm2/dist

[Adam Hamsik <haad%netbsd.org@localhost>]

Module Name:    src
Committed By:   haad
Date:           Wed Feb 18 12:16:13 UTC 2009

Modified Files:
        src/external/gpl2/lvm2/dist/include: configure.h
        src/external/gpl2/lvm2/dist/lib/activate: fs.c
        src/external/gpl2/lvm2/dist/lib/commands: toolcontext.c
        src/external/gpl2/lvm2/dist/lib/device: dev-io.c
        src/external/gpl2/lvm2/dist/lib/metadata: lv_manip.c
        src/external/gpl2/lvm2/dist/libdm: libdm-common.c libdm-deptree.c
        src/external/gpl2/lvm2/dist/man: Makefile.in clvmd.8 dmsetup.8 fsadm.8
            lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8
            lvm.conf.5 lvmchange.8 lvmdiskscan.8 lvmdump.8 lvreduce.8
            lvremove.8 lvrename.8 lvresize.8 lvs.8 lvscan.8 pvchange.8 pvck.8
            pvcreate.8 pvdisplay.8 pvmove.8 pvremove.8 pvresize.8 pvs.8
            pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 vgck.8 vgconvert.8
            vgcreate.8 vgdisplay.8 vgexport.8 vgextend.8 vgimport.8 vgmerge.8
            vgmknodes.8 vgreduce.8 vgremove.8 vgrename.8 vgs.8 vgscan.8
            vgsplit.8
Removed Files:
        src/external/gpl2/lvm2/dist/po: lvm2.po
        src/external/gpl2/lvm2/dist/scripts: clvmd_init clvmd_init_rhel4

Log Message:
Merge conflicts and NetBSD local changes.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/external/gpl2/lvm2/dist/include/configure.h
cvs rdiff -r1.2 -r1.3 src/external/gpl2/lvm2/dist/lib/activate/fs.c
cvs rdiff -r1.3 -r1.4 src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
cvs rdiff -r1.3 -r1.4 src/external/gpl2/lvm2/dist/lib/device/dev-io.c
cvs rdiff -r1.2 -r1.3 src/external/gpl2/lvm2/dist/lib/metadata/lv_manip.c
cvs rdiff -r1.2 -r1.3 src/external/gpl2/lvm2/dist/libdm/libdm-common.c \
    src/external/gpl2/lvm2/dist/libdm/libdm-deptree.c
cvs rdiff -r1.1.1.1 -r1.2 src/external/gpl2/lvm2/dist/man/Makefile.in \
    src/external/gpl2/lvm2/dist/man/clvmd.8 \
    src/external/gpl2/lvm2/dist/man/dmsetup.8 \
    src/external/gpl2/lvm2/dist/man/lvchange.8 \
    src/external/gpl2/lvm2/dist/man/lvconvert.8 \
    src/external/gpl2/lvm2/dist/man/lvcreate.8 \
    src/external/gpl2/lvm2/dist/man/lvdisplay.8 \
    src/external/gpl2/lvm2/dist/man/lvextend.8 \
    src/external/gpl2/lvm2/dist/man/lvm.8 \
    src/external/gpl2/lvm2/dist/man/lvm.conf.5 \
    src/external/gpl2/lvm2/dist/man/lvmchange.8 \
    src/external/gpl2/lvm2/dist/man/lvmdiskscan.8 \
    src/external/gpl2/lvm2/dist/man/lvmdump.8 \
    src/external/gpl2/lvm2/dist/man/lvreduce.8 \
    src/external/gpl2/lvm2/dist/man/lvremove.8 \
    src/external/gpl2/lvm2/dist/man/lvrename.8 \
    src/external/gpl2/lvm2/dist/man/lvresize.8 \
    src/external/gpl2/lvm2/dist/man/lvs.8 \
    src/external/gpl2/lvm2/dist/man/lvscan.8 \
    src/external/gpl2/lvm2/dist/man/pvchange.8 \
    src/external/gpl2/lvm2/dist/man/pvck.8 \
    src/external/gpl2/lvm2/dist/man/pvcreate.8 \
    src/external/gpl2/lvm2/dist/man/pvdisplay.8 \
    src/external/gpl2/lvm2/dist/man/pvmove.8 \
    src/external/gpl2/lvm2/dist/man/pvremove.8 \
    src/external/gpl2/lvm2/dist/man/pvresize.8 \
    src/external/gpl2/lvm2/dist/man/pvs.8 \
    src/external/gpl2/lvm2/dist/man/pvscan.8 \
    src/external/gpl2/lvm2/dist/man/vgcfgbackup.8 \
    src/external/gpl2/lvm2/dist/man/vgcfgrestore.8 \
    src/external/gpl2/lvm2/dist/man/vgchange.8 \
    src/external/gpl2/lvm2/dist/man/vgck.8 \
    src/external/gpl2/lvm2/dist/man/vgconvert.8 \
    src/external/gpl2/lvm2/dist/man/vgcreate.8 \
    src/external/gpl2/lvm2/dist/man/vgdisplay.8 \
    src/external/gpl2/lvm2/dist/man/vgexport.8 \
    src/external/gpl2/lvm2/dist/man/vgextend.8 \
    src/external/gpl2/lvm2/dist/man/vgimport.8 \
    src/external/gpl2/lvm2/dist/man/vgmerge.8 \
    src/external/gpl2/lvm2/dist/man/vgmknodes.8 \
    src/external/gpl2/lvm2/dist/man/vgreduce.8 \
    src/external/gpl2/lvm2/dist/man/vgremove.8 \
    src/external/gpl2/lvm2/dist/man/vgrename.8 \
    src/external/gpl2/lvm2/dist/man/vgs.8 \
    src/external/gpl2/lvm2/dist/man/vgscan.8 \
    src/external/gpl2/lvm2/dist/man/vgsplit.8
cvs rdiff -r1.1.1.2 -r1.2 src/external/gpl2/lvm2/dist/man/fsadm.8
cvs rdiff -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/po/lvm2.po
cvs rdiff -r1.1.1.1 -r0 src/external/gpl2/lvm2/dist/scripts/clvmd_init \
    src/external/gpl2/lvm2/dist/scripts/clvmd_init_rhel4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.