shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

vdo: Rename vdoimport to lvm_import_vdo.

Browse Source
This commit is contained in:
Marian Csontos 2021-08-26 16:53:33 +02:00
parent 0969e90d45
commit bbbd4fed69
10 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.03.14 -
==================================
Rename vdoimport to lvm_import_vdo.
Version 2.03.13 - 11th August 2021
==================================

6
configure vendored
View File

@ -12552,8 +12552,8 @@ $as_echo "$FSADM" >&6; }
################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install vdoimport" >&5
$as_echo_n "checking whether to install vdoimport... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install lvm_import_vdo" >&5
$as_echo_n "checking whether to install lvm_import_vdo... " >&6; }
# Check whether --enable-vdoimport was given.
if test "${enable_vdoimport+set}" = set; then :
enableval=$enable_vdoimport; VDOIMPORT=$enableval
@ -14048,7 +14048,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
VDOIMPORT_PATH="$SBINDIR/vdoimport"
VDOIMPORT_PATH="$SBINDIR/lvm_import_vdo"
cat >>confdefs.h <<_ACEOF
#define VDOIMPORT_PATH "$VDOIMPORT_PATH"

8
configure.ac
View File

@ -1315,8 +1315,8 @@ AC_MSG_RESULT($FSADM)
################################################################################
dnl -- Enable vdoimport
AC_MSG_CHECKING(whether to install vdoimport)
dnl -- Enable lvm_import_vdo
AC_MSG_CHECKING(whether to install lvm_import_vdo)
AC_ARG_ENABLE(vdoimport, AC_HELP_STRING([--disable-vdoimport], [disable vdoimport]),
VDOIMPORT=$enableval)
AC_MSG_RESULT($VDOIMPORT)
@ -1676,8 +1676,8 @@ USRSBINDIR="$(eval echo $(eval echo $usrsbindir))"
FSADM_PATH="$SBINDIR/fsadm"
AC_DEFINE_UNQUOTED(FSADM_PATH, ["$FSADM_PATH"], [Path to fsadm binary.])
VDOIMPORT_PATH="$SBINDIR/vdoimport"
AC_DEFINE_UNQUOTED(VDOIMPORT_PATH, ["$VDOIMPORT_PATH"], [Path to vdoimport binary.])
VDOIMPORT_PATH="$SBINDIR/lvm_import_vdo"
AC_DEFINE_UNQUOTED(VDOIMPORT_PATH, ["$VDOIMPORT_PATH"], [Path to lvm_import_vdo binary.])
################################################################################
dnl -- dmeventd pidfile and executable path

2
include/configure.h.in
View File

@ -687,7 +687,7 @@
/* Enable a valgrind aware build of pool */
#undef VALGRIND_POOL
/* Path to vdoimport binary. */
/* Path to lvm_import_vdo binary. */
#undef VDOIMPORT_PATH
/* The path to 'vdoformat', if available. */

2
man/Makefile.in
View File

@ -23,7 +23,7 @@ else
endif
FSADMMAN = fsadm.8
VDOIMPORTMAN = vdoimport.8
VDOIMPORTMAN = lvm_import_vdo.8
BLKDEACTIVATEMAN = blkdeactivate.8
DMEVENTDMAN = dmeventd.8
DMFILEMAPDMAN = dmfilemapd.8

8
man/vdoimport.8_main → man/lvm_import_vdo.8_main
View File

@ -2,14 +2,14 @@
.
.SH "NAME"
.
vdoimport \(em utility to import VDO volumes into a new volume group.
lvm_import_vdo \(em utility to import VDO volumes into a new volume group.
.
.SH SYNOPSIS
.
.PD 0
.ad l
.TP 10
.B vdoimport
.B lvm_import_vdo
.RI [ options ]
.IR device
.
@ -17,7 +17,7 @@ vdoimport \(em utility to import VDO volumes into a new volume group.
.
.SH DESCRIPTION
.
vdoimport utility imports VDO volumes created and managed by
lvm_import_vdo utility imports VDO volumes created and managed by
.BR vdo (8)
manager into
.BR lvm2 (8)
@ -69,7 +69,7 @@ A status code of 1 is used for failure.
Convert VDO volume created by vdo manager into logical volume LV1 with within volume group VG1.
.P
#
.B vdoimport --name VG1/LV1 /dev/mapper/vdo-volume
.B lvm_import_vdo --name VG1/LV1 /dev/mapper/vdo-volume
.
.SH ENVIRONMENT VARIABLES
.

2
scripts/Makefile.in
View File

@ -32,7 +32,7 @@ ifeq ("@FSADM@", "yes")
endif
ifeq ("@VDOIMPORT@", "yes")
LVM_SCRIPTS += vdoimport.sh
LVM_SCRIPTS += lvm_import_vdo.sh
endif
ifeq ("@BLKDEACTIVATE@", "yes")

2
scripts/vdoimport.sh → scripts/lvm_import_vdo.sh
View File

@ -28,7 +28,7 @@
set -euE -o pipefail
TOOL=vdoimport
TOOL=lvm_import_vdo
_SAVEPATH=$PATH
PATH="/sbin:/usr/sbin:/bin:/usr/sbin:$PATH"

2
test/Makefile.in
View File

@ -368,7 +368,7 @@ LIB = $(addprefix lib/, $(LIB_SECURETEST) $(LIB_DMSECURETEST) $(LIB_SHARED) $(LI
$(Q) $(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/
$(Q) $(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/
$(Q) $(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm
$(Q) $(LN_S) -f $(abs_top_srcdir)/scripts/vdoimport.sh lib/vdoimport
$(Q) $(LN_S) -f $(abs_top_srcdir)/scripts/lvm_import_vdo.sh lib/lvm_import_vdo
@test "$(srcdir)" = . || \
for i in $(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF); do \
test -n "$(Q)" || echo "$(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/"; \

12
test/shell/vdo-convert.sh
View File

@ -54,12 +54,12 @@ vdo create $VDOCONF --name "$VDONAME" --device="$DM_DEV_DIR/$vg/$lv1" --vdoLogic
mkfs -E nodiscard "$DM_DEV_DIR/mapper/$VDONAME"
# Different VG name fails
not vdoimport -y -v --name $vg1/$lv1 "$DM_DEV_DIR/$vg/$lv1"
not lvm_import_vdo -y -v --name $vg1/$lv1 "$DM_DEV_DIR/$vg/$lv1"
# Try just dry run and observe logging
vdoimport --dry-run -y -v --name $lv1 "$DM_DEV_DIR/$vg/$lv1"
lvm_import_vdo --dry-run -y -v --name $lv1 "$DM_DEV_DIR/$vg/$lv1"
vdoimport -y --name $lv1 "$DM_DEV_DIR/$vg/$lv1"
lvm_import_vdo -y --name $lv1 "$DM_DEV_DIR/$vg/$lv1"
# ATM needed - since we do not call 'vdo convert' in this case
vdo remove $VDOCONF --force --name "$VDONAME" || true
@ -79,13 +79,13 @@ vdo create $VDOCONF --name "$VDONAME" --device="$dev1" --vdoLogicalSize=31G
mkfs -E nodiscard "$DM_DEV_DIR/mapper/$VDONAME"
# Fail with an already existing volume group $vg2
not vdoimport --dry-run -y -v --name $vg2/$lv1 "$dev1" |& tee err
not lvm_import_vdo --dry-run -y -v --name $vg2/$lv1 "$dev1" |& tee err
grep "already existing volume group" err
# User can also convert already stopped VDO volume
vdo stop $VDOCONF --name "$VDONAME"
vdoimport -y -v --name $vg/$lv1 "$dev1"
lvm_import_vdo -y -v --name $vg/$lv1 "$dev1"
fsck -n "$DM_DEV_DIR/$vg/$lv1"
@ -102,7 +102,7 @@ vdo create $VDOCONF --name "$VDONAME" --device="$dev1" --vdoLogicalSize=23G
mkfs -E nodiscard "$DM_DEV_DIR/mapper/$VDONAME"
vdoimport -y -v --name $vg1/$lv2 "$dev1"
lvm_import_vdo -y -v --name $vg1/$lv2 "$dev1"
fsck -n "$DM_DEV_DIR/$vg1/$lv2"