--- lvm2-2.01.15.orig/autoconf/config.guess +++ lvm2-2.01.15/autoconf/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-06-17' +timestamp='2004-11-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -197,15 +197,21 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -221,25 +227,33 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,14 +291,12 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -307,6 +319,12 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -327,7 +345,7 @@ DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -399,6 +417,9 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -734,7 +755,7 @@ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -742,6 +763,11 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -751,19 +777,8 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -796,8 +811,13 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; @@ -807,9 +827,18 @@ cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -945,6 +974,9 @@ LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 @@ -975,6 +1007,9 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1044,9 +1079,9 @@ M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1144,9 +1179,10 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1161,7 +1197,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1205,6 +1241,19 @@ SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- lvm2-2.01.15.orig/autoconf/config.sub +++ lvm2-2.01.15/autoconf/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-06-17' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -228,14 +229,15 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -247,6 +249,7 @@ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ @@ -259,12 +262,12 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -297,15 +300,15 @@ | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -319,11 +322,13 @@ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -332,14 +337,14 @@ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -359,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -376,6 +384,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -435,12 +446,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -463,6 +489,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -641,10 +671,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -725,10 +751,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -740,6 +762,10 @@ basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -960,6 +986,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1003,6 +1033,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1033,6 +1067,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1055,7 +1092,7 @@ sh64) basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1128,19 +1165,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1164,6 +1202,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1176,6 +1217,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1197,6 +1241,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1219,6 +1266,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1255,6 +1305,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1335,6 +1388,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1467,9 +1523,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; --- lvm2-2.01.15.orig/make.tmpl.in +++ lvm2-2.01.15/make.tmpl.in @@ -57,7 +57,7 @@ SUFFIXES = .c .d .o .so .a .po .pot .mo -CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline +CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -D_FILE_OFFSET_BITS=64 #CFLAGS += -W -Wconversion -Wpointer-arith -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wmissing-noreturn @@ -178,7 +178,7 @@ $(SOURCES:%.c=%.pot) $(LDDEPS) \ config.cache config.log config.status \ Makefile make.tmpl core \ - version.h lvm2.po + version.h .export.sym: .exported_symbols set -e; (echo "Base {"; echo " global:"; \ --- lvm2-2.01.15.orig/daemons/clvmd/Makefile.in +++ lvm2-2.01.15/daemons/clvmd/Makefile.in @@ -67,7 +67,7 @@ .PHONY: install_clvmd install_clvmd: $(TARGETS) - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) clvmd \ $(sbindir)/clvmd install: $(INSTALL_TARGETS) --- lvm2-2.01.15.orig/doc/example.conf +++ lvm2-2.01.15/doc/example.conf @@ -40,11 +40,11 @@ # If it doesn't do what you expect, check the output of 'vgscan -vvvv'. - # By default we accept every block device: - filter = [ "a/.*/" ] + # By default we accept every block device + # filter = [ "a/.*/" ] # Exclude the cdrom drive - # filter = [ "r|/dev/cdrom|" ] + filter = [ "r|/dev/cdrom|" ] # When testing I like to work with just loopback devices: # filter = [ "a/loop/", "r/.*/" ] @@ -78,7 +78,7 @@ # By default, LVM2 will ignore devices used as components of # software RAID (md) devices by looking for md superblocks. # 1 enables; 0 disables. - md_component_detection = 1 + md_component_detection = 0 } # This section that allows you to configure the nature of the @@ -222,7 +222,14 @@ # Full pathnames can be given. # Search this directory first for shared libraries. - # library_dir = "/lib" + # library_dir = "/lib/lvm2" + + # Enable these three for cluster LVM when clvmd is running. + # Remember to remove the "locking_type = 1" above. + # + # locking_library = "liblvm2clusterlock.so" + # locking_type = 2 + # library_dir = "/lib/lvm2" } activation { --- lvm2-2.01.15.orig/lib/device/dev-io.c +++ lvm2-2.01.15/lib/device/dev-io.c @@ -376,6 +376,8 @@ /* Don't update atime on device inodes */ if (!(dev->flags & DEV_REGULAR)) flags |= O_NOATIME; +#else +# error miss O_NOATIME #endif if ((dev->fd = open(name, flags, 0777)) < 0) { --- lvm2-2.01.15.orig/lib/locking/Makefile.in +++ lvm2-2.01.15/lib/locking/Makefile.in @@ -23,7 +23,7 @@ include $(top_srcdir)/make.tmpl install install_cluster: liblvm2clusterlock.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) $< \ $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION) $(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \ $(libdir)/liblvm2clusterlock.so --- lvm2-2.01.15.orig/po/lvm2.po +++ lvm2-2.01.15/po/lvm2.po @@ -1,12 +1,13 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-08-04 00:07+0100\n" +"POT-Creation-Date: 2005-02-01 16:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,9 +53,9 @@ #: activate/activate.c:418 activate/activate.c:426 activate/activate.c:431 #: activate/activate.c:443 activate/activate.c:455 activate/activate.c:469 #: activate/activate.c:474 activate/activate.c:486 activate/activate.c:491 -#: activate/activate.c:503 activate/activate.c:508 activate/activate.c:568 -#: activate/activate.c:614 activate/activate.c:659 activate/activate.c:728 -#: activate/activate.c:767 activate/dev_manager.c:179 +#: activate/activate.c:503 activate/activate.c:508 activate/activate.c:572 +#: activate/activate.c:618 activate/activate.c:663 activate/activate.c:732 +#: activate/activate.c:771 activate/dev_manager.c:179 #: activate/dev_manager.c:197 activate/dev_manager.c:225 #: activate/dev_manager.c:234 activate/dev_manager.c:239 #: activate/dev_manager.c:245 activate/dev_manager.c:286 @@ -66,273 +67,238 @@ #: activate/dev_manager.c:555 activate/dev_manager.c:615 #: activate/dev_manager.c:621 activate/dev_manager.c:628 #: activate/dev_manager.c:657 activate/dev_manager.c:714 -#: activate/dev_manager.c:723 activate/dev_manager.c:766 -#: activate/dev_manager.c:772 activate/dev_manager.c:782 -#: activate/dev_manager.c:821 activate/dev_manager.c:835 -#: activate/dev_manager.c:860 activate/dev_manager.c:900 -#: activate/dev_manager.c:905 activate/dev_manager.c:913 -#: activate/dev_manager.c:936 activate/dev_manager.c:941 -#: activate/dev_manager.c:947 activate/dev_manager.c:952 -#: activate/dev_manager.c:958 activate/dev_manager.c:966 -#: activate/dev_manager.c:983 activate/dev_manager.c:988 -#: activate/dev_manager.c:1003 activate/dev_manager.c:1008 -#: activate/dev_manager.c:1041 activate/dev_manager.c:1051 -#: activate/dev_manager.c:1067 activate/dev_manager.c:1077 -#: activate/dev_manager.c:1099 activate/dev_manager.c:1108 -#: activate/dev_manager.c:1122 activate/dev_manager.c:1130 -#: activate/dev_manager.c:1143 activate/dev_manager.c:1163 -#: activate/dev_manager.c:1168 activate/dev_manager.c:1174 -#: activate/dev_manager.c:1196 activate/dev_manager.c:1216 -#: activate/dev_manager.c:1235 activate/dev_manager.c:1246 -#: activate/dev_manager.c:1261 activate/dev_manager.c:1273 -#: activate/dev_manager.c:1287 activate/dev_manager.c:1300 -#: activate/dev_manager.c:1310 activate/dev_manager.c:1350 -#: activate/dev_manager.c:1361 activate/dev_manager.c:1371 -#: activate/dev_manager.c:1379 activate/dev_manager.c:1386 -#: activate/dev_manager.c:1462 activate/dev_manager.c:1481 -#: activate/dev_manager.c:1503 activate/dev_manager.c:1511 -#: activate/dev_manager.c:1539 activate/dev_manager.c:1544 -#: activate/dev_manager.c:1573 activate/dev_manager.c:1579 -#: activate/dev_manager.c:1600 activate/dev_manager.c:1618 -#: activate/dev_manager.c:1632 activate/dev_manager.c:1642 -#: activate/dev_manager.c:1652 activate/dev_manager.c:1670 -#: activate/dev_manager.c:1693 activate/dev_manager.c:1727 -#: activate/dev_manager.c:1743 activate/dev_manager.c:1800 -#: activate/dev_manager.c:1809 activate/dev_manager.c:1818 -#: activate/dev_manager.c:1827 activate/dev_manager.c:1832 -#: activate/dev_manager.c:1837 activate/dev_manager.c:1849 -#: activate/dev_manager.c:1859 activate/dev_manager.c:1865 -#: activate/dev_manager.c:1901 activate/dev_manager.c:1906 -#: activate/dev_manager.c:1938 activate/dev_manager.c:1956 -#: activate/dev_manager.c:2132 activate/dev_manager.c:2144 -#: activate/dev_manager.c:2150 activate/dev_manager.c:2164 -#: activate/dev_manager.c:2169 activate/dev_manager.c:2176 -#: activate/dev_manager.c:2184 activate/dev_manager.c:2192 -#: activate/dev_manager.c:2198 activate/dev_manager.c:2205 -#: activate/dev_manager.c:2210 activate/dev_manager.c:2238 activate/fs.c:234 +#: activate/dev_manager.c:723 activate/dev_manager.c:778 +#: activate/dev_manager.c:803 activate/dev_manager.c:846 +#: activate/dev_manager.c:866 activate/dev_manager.c:889 +#: activate/dev_manager.c:894 activate/dev_manager.c:925 +#: activate/dev_manager.c:933 activate/dev_manager.c:950 +#: activate/dev_manager.c:955 activate/dev_manager.c:970 +#: activate/dev_manager.c:975 activate/dev_manager.c:1008 +#: activate/dev_manager.c:1018 activate/dev_manager.c:1034 +#: activate/dev_manager.c:1044 activate/dev_manager.c:1066 +#: activate/dev_manager.c:1075 activate/dev_manager.c:1089 +#: activate/dev_manager.c:1097 activate/dev_manager.c:1110 +#: activate/dev_manager.c:1130 activate/dev_manager.c:1135 +#: activate/dev_manager.c:1141 activate/dev_manager.c:1163 +#: activate/dev_manager.c:1184 activate/dev_manager.c:1206 +#: activate/dev_manager.c:1218 activate/dev_manager.c:1230 +#: activate/dev_manager.c:1244 activate/dev_manager.c:1257 +#: activate/dev_manager.c:1267 activate/dev_manager.c:1307 +#: activate/dev_manager.c:1318 activate/dev_manager.c:1328 +#: activate/dev_manager.c:1335 activate/dev_manager.c:1341 +#: activate/dev_manager.c:1409 activate/dev_manager.c:1428 +#: activate/dev_manager.c:1450 activate/dev_manager.c:1458 +#: activate/dev_manager.c:1486 activate/dev_manager.c:1491 +#: activate/dev_manager.c:1520 activate/dev_manager.c:1526 +#: activate/dev_manager.c:1547 activate/dev_manager.c:1565 +#: activate/dev_manager.c:1579 activate/dev_manager.c:1589 +#: activate/dev_manager.c:1599 activate/dev_manager.c:1617 +#: activate/dev_manager.c:1640 activate/dev_manager.c:1674 +#: activate/dev_manager.c:1690 activate/dev_manager.c:1748 +#: activate/dev_manager.c:1757 activate/dev_manager.c:1766 +#: activate/dev_manager.c:1775 activate/dev_manager.c:1780 +#: activate/dev_manager.c:1785 activate/dev_manager.c:1797 +#: activate/dev_manager.c:1807 activate/dev_manager.c:1813 +#: activate/dev_manager.c:1849 activate/dev_manager.c:1854 +#: activate/dev_manager.c:1886 activate/dev_manager.c:1904 +#: activate/dev_manager.c:2079 activate/dev_manager.c:2091 +#: activate/dev_manager.c:2097 activate/dev_manager.c:2111 +#: activate/dev_manager.c:2116 activate/dev_manager.c:2123 +#: activate/dev_manager.c:2131 activate/dev_manager.c:2139 +#: activate/dev_manager.c:2145 activate/dev_manager.c:2152 +#: activate/dev_manager.c:2157 activate/dev_manager.c:2185 activate/fs.c:234 #: activate/fs.c:241 activate/fs.c:248 activate/fs.c:251 activate/fs.c:325 -#: archiver.c:68 archiver.c:75 archiver.c:87 archiver.c:163 archiver.c:236 +#: archiver.c:71 archiver.c:78 archiver.c:90 archiver.c:166 archiver.c:236 #: archiver.c:286 archiver.c:303 archiver.c:345 archiver.c:350 -#: cache/lvmcache.c:474 cache/lvmcache.c:515 cache/lvmcache.c:546 -#: commands/toolcontext.c:276 commands/toolcontext.c:295 -#: commands/toolcontext.c:302 commands/toolcontext.c:379 -#: commands/toolcontext.c:394 commands/toolcontext.c:418 -#: commands/toolcontext.c:469 commands/toolcontext.c:662 -#: commands/toolcontext.c:758 config/config.c:105 config/config.c:110 +#: cache/lvmcache.c:454 cache/lvmcache.c:495 cache/lvmcache.c:526 +#: commands/toolcontext.c:274 commands/toolcontext.c:293 +#: commands/toolcontext.c:300 commands/toolcontext.c:377 +#: commands/toolcontext.c:392 commands/toolcontext.c:416 +#: commands/toolcontext.c:467 commands/toolcontext.c:643 +#: commands/toolcontext.c:740 config/config.c:105 config/config.c:110 #: config/config.c:140 config/config.c:161 config/config.c:192 #: config/config.c:239 config/config.c:244 config/config.c:406 #: config/config.c:424 config/config.c:429 config/config.c:439 #: config/config.c:453 config/config.c:469 config/config.c:525 #: config/config.c:708 datastruct/btree.c:90 datastruct/hash.c:96 #: datastruct/hash.c:109 datastruct/str_list.c:24 datastruct/str_list.c:38 -#: datastruct/str_list.c:47 datastruct/str_list.c:77 device/dev-cache.c:204 -#: device/dev-cache.c:217 device/dev-cache.c:262 device/dev-cache.c:266 -#: device/dev-cache.c:337 device/dev-cache.c:368 device/dev-cache.c:407 -#: device/dev-cache.c:453 device/dev-cache.c:458 device/dev-io.c:174 -#: device/dev-io.c:204 device/dev-io.c:348 device/dev-io.c:516 -#: device/dev-io.c:537 device/dev-io.c:555 device/dev-io.c:574 -#: device/dev-io.c:602 device/dev-md.c:41 device/dev-md.c:49 -#: device/dev-md.c:64 device/device.c:61 device/device.c:66 device/device.c:90 -#: display/display.c:211 display/display.c:242 display/display.c:300 -#: display/display.c:346 display/display.c:577 display/display.c:613 -#: error/errseg.c:90 filters/filter-composite.c:54 -#: filters/filter-persistent.c:45 filters/filter-persistent.c:105 -#: filters/filter-persistent.c:110 filters/filter-persistent.c:239 -#: filters/filter-persistent.c:245 filters/filter-persistent.c:257 -#: filters/filter-regex.c:78 filters/filter-regex.c:105 -#: filters/filter-regex.c:126 filters/filter-regex.c:151 -#: filters/filter-regex.c:210 filters/filter-regex.c:215 -#: filters/filter-regex.c:222 filters/filter-regex.c:227 -#: filters/filter-sysfs.c:285 filters/filter.c:254 format1/disk-rep.c:220 -#: format1/disk-rep.c:232 format1/disk-rep.c:237 format1/disk-rep.c:256 -#: format1/disk-rep.c:259 format1/disk-rep.c:290 format1/disk-rep.c:293 -#: format1/disk-rep.c:312 format1/disk-rep.c:315 format1/disk-rep.c:332 -#: format1/disk-rep.c:342 format1/disk-rep.c:348 format1/disk-rep.c:413 -#: format1/disk-rep.c:420 format1/disk-rep.c:511 format1/disk-rep.c:532 -#: format1/disk-rep.c:544 format1/disk-rep.c:572 format1/disk-rep.c:586 -#: format1/disk-rep.c:619 format1/disk-rep.c:684 format1/disk-rep.c:691 -#: format1/disk-rep.c:707 format1/format1.c:174 format1/format1.c:189 -#: format1/format1.c:198 format1/format1.c:203 format1/format1.c:220 -#: format1/format1.c:234 format1/format1.c:252 format1/format1.c:263 -#: format1/format1.c:278 format1/format1.c:304 format1/format1.c:309 -#: format1/format1.c:314 format1/format1.c:319 format1/format1.c:356 -#: format1/format1.c:403 format1/format1.c:419 format1/format1.c:424 -#: format1/format1.c:431 format1/format1.c:443 format1/format1.c:494 -#: format1/format1.c:514 format1/format1.c:523 format1/format1.c:567 -#: format1/import-export.c:62 format1/import-export.c:96 -#: format1/import-export.c:128 format1/import-export.c:148 -#: format1/import-export.c:165 format1/import-export.c:173 -#: format1/import-export.c:208 format1/import-export.c:213 -#: format1/import-export.c:218 format1/import-export.c:296 -#: format1/import-export.c:428 format1/import-export.c:433 -#: format1/import-export.c:454 format1/import-export.c:461 -#: format1/import-export.c:483 format1/import-export.c:504 -#: format1/import-export.c:509 format1/import-export.c:518 -#: format1/import-export.c:528 format1/import-export.c:538 -#: format1/import-export.c:543 format1/import-export.c:646 -#: format1/import-export.c:694 format1/import-extents.c:65 +#: datastruct/str_list.c:47 datastruct/str_list.c:77 device/dev-cache.c:182 +#: device/dev-cache.c:189 device/dev-cache.c:195 device/dev-cache.c:229 +#: device/dev-cache.c:300 device/dev-cache.c:348 device/dev-cache.c:393 +#: device/dev-cache.c:398 device/dev-io.c:174 device/dev-io.c:204 +#: device/dev-io.c:322 device/dev-io.c:465 device/dev-io.c:486 +#: device/dev-io.c:504 device/dev-io.c:523 device/dev-io.c:551 +#: device/dev-md.c:41 device/dev-md.c:49 device/dev-md.c:64 device/device.c:61 +#: device/device.c:66 device/device.c:90 display/display.c:211 +#: display/display.c:242 display/display.c:300 display/display.c:347 +#: display/display.c:587 display/display.c:623 error/errseg.c:90 +#: filters/filter-composite.c:54 filters/filter-persistent.c:45 +#: filters/filter-persistent.c:103 filters/filter-persistent.c:108 +#: filters/filter-persistent.c:239 filters/filter-persistent.c:245 +#: filters/filter-persistent.c:257 filters/filter-regex.c:78 +#: filters/filter-regex.c:105 filters/filter-regex.c:126 +#: filters/filter-regex.c:151 filters/filter-regex.c:212 +#: filters/filter-regex.c:217 filters/filter-regex.c:224 +#: filters/filter-regex.c:229 filters/filter-sysfs.c:285 filters/filter.c:253 +#: format1/disk-rep.c:220 format1/disk-rep.c:232 format1/disk-rep.c:237 +#: format1/disk-rep.c:256 format1/disk-rep.c:259 format1/disk-rep.c:290 +#: format1/disk-rep.c:293 format1/disk-rep.c:312 format1/disk-rep.c:315 +#: format1/disk-rep.c:332 format1/disk-rep.c:342 format1/disk-rep.c:348 +#: format1/disk-rep.c:413 format1/disk-rep.c:420 format1/disk-rep.c:511 +#: format1/disk-rep.c:534 format1/disk-rep.c:546 format1/disk-rep.c:576 +#: format1/disk-rep.c:590 format1/disk-rep.c:623 format1/disk-rep.c:688 +#: format1/disk-rep.c:695 format1/disk-rep.c:713 format1/format1.c:177 +#: format1/format1.c:192 format1/format1.c:201 format1/format1.c:206 +#: format1/format1.c:223 format1/format1.c:237 format1/format1.c:258 +#: format1/format1.c:269 format1/format1.c:284 format1/format1.c:310 +#: format1/format1.c:315 format1/format1.c:320 format1/format1.c:325 +#: format1/format1.c:362 format1/format1.c:409 format1/format1.c:425 +#: format1/format1.c:430 format1/format1.c:437 format1/format1.c:449 +#: format1/format1.c:500 format1/format1.c:520 format1/format1.c:529 +#: format1/format1.c:573 format1/import-export.c:61 +#: format1/import-export.c:121 format1/import-export.c:141 +#: format1/import-export.c:158 format1/import-export.c:166 +#: format1/import-export.c:201 format1/import-export.c:206 +#: format1/import-export.c:211 format1/import-export.c:289 +#: format1/import-export.c:426 format1/import-export.c:431 +#: format1/import-export.c:452 format1/import-export.c:459 +#: format1/import-export.c:484 format1/import-export.c:506 +#: format1/import-export.c:511 format1/import-export.c:520 +#: format1/import-export.c:528 format1/import-export.c:539 +#: format1/import-export.c:544 format1/import-export.c:669 +#: format1/import-export.c:726 format1/import-extents.c:65 #: format1/import-extents.c:72 format1/import-extents.c:77 -#: format1/import-extents.c:130 format1/import-extents.c:196 -#: format1/import-extents.c:210 format1/import-extents.c:231 -#: format1/import-extents.c:280 format1/import-extents.c:312 -#: format1/import-extents.c:338 format1/import-extents.c:354 -#: format1/import-extents.c:369 format1/layout.c:124 format1/lvm1-label.c:66 -#: format1/vg_number.c:38 format1/vg_number.c:43 format_pool/disk_rep.c:51 -#: format_pool/disk_rep.c:104 format_pool/disk_rep.c:258 -#: format_pool/disk_rep.c:360 format_pool/disk_rep.c:370 -#: format_pool/disk_rep.c:375 format_pool/format_pool.c:134 +#: format1/import-extents.c:133 format1/import-extents.c:199 +#: format1/import-extents.c:216 format1/import-extents.c:281 +#: format1/import-extents.c:287 format1/import-extents.c:335 +#: format1/import-extents.c:351 format1/import-extents.c:366 +#: format1/layout.c:124 format1/lvm1-label.c:66 format1/vg_number.c:39 +#: format1/vg_number.c:44 format_pool/disk_rep.c:51 format_pool/disk_rep.c:107 +#: format_pool/disk_rep.c:263 format_pool/disk_rep.c:366 +#: format_pool/disk_rep.c:376 format_pool/disk_rep.c:381 #: format_pool/format_pool.c:139 format_pool/format_pool.c:144 -#: format_pool/format_pool.c:154 format_pool/format_pool.c:163 -#: format_pool/format_pool.c:168 format_pool/format_pool.c:188 -#: format_pool/format_pool.c:197 format_pool/format_pool.c:203 -#: format_pool/format_pool.c:233 format_pool/format_pool.c:238 -#: format_pool/format_pool.c:248 format_pool/format_pool.c:253 -#: format_pool/import_export.c:94 format_pool/import_export.c:180 -#: format_pool/import_export.c:218 format_pool/import_export.c:232 -#: format_pool/import_export.c:256 format_pool/import_export.c:276 -#: format_pool/import_export.c:304 format_pool/import_export.c:309 -#: format_text/archive.c:119 format_text/archive.c:140 -#: format_text/archive.c:167 format_text/archive.c:259 -#: format_text/archive.c:270 format_text/archive.c:346 -#: format_text/archive.c:366 format_text/archiver.c:82 -#: format_text/archiver.c:89 format_text/archiver.c:101 -#: format_text/archiver.c:189 format_text/archiver.c:267 -#: format_text/archiver.c:317 format_text/archiver.c:334 -#: format_text/archiver.c:376 format_text/archiver.c:381 -#: format_text/export.c:113 format_text/export.c:178 format_text/export.c:188 -#: format_text/export.c:279 format_text/export.c:280 format_text/export.c:281 -#: format_text/export.c:282 format_text/export.c:284 format_text/export.c:285 -#: format_text/export.c:288 format_text/export.c:289 format_text/export.c:299 -#: format_text/export.c:303 format_text/export.c:305 format_text/export.c:308 -#: format_text/export.c:311 format_text/export.c:315 format_text/export.c:318 -#: format_text/export.c:322 format_text/export.c:326 format_text/export.c:329 -#: format_text/export.c:330 format_text/export.c:334 format_text/export.c:336 -#: format_text/export.c:360 format_text/export.c:367 format_text/export.c:371 -#: format_text/export.c:372 format_text/export.c:376 format_text/export.c:380 -#: format_text/export.c:382 format_text/export.c:385 format_text/export.c:388 -#: format_text/export.c:391 format_text/export.c:395 format_text/export.c:398 -#: format_text/export.c:401 format_text/export.c:404 format_text/export.c:409 -#: format_text/export.c:413 format_text/export.c:422 format_text/export.c:425 -#: format_text/export.c:428 format_text/export.c:432 format_text/export.c:433 -#: format_text/export.c:437 format_text/export.c:440 format_text/export.c:445 -#: format_text/export.c:450 format_text/export.c:461 format_text/export.c:463 -#: format_text/export.c:470 format_text/export.c:476 format_text/export.c:482 -#: format_text/export.c:490 format_text/export.c:500 format_text/export.c:501 -#: format_text/export.c:506 format_text/export.c:510 format_text/export.c:513 -#: format_text/export.c:516 format_text/export.c:520 format_text/export.c:523 -#: format_text/export.c:528 format_text/export.c:531 format_text/export.c:533 -#: format_text/export.c:535 format_text/export.c:536 format_text/export.c:537 -#: format_text/export.c:542 format_text/export.c:548 format_text/export.c:563 -#: format_text/export.c:573 format_text/export.c:582 format_text/export.c:588 -#: format_text/export.c:606 format_text/export.c:611 format_text/export.c:620 -#: format_text/export.c:625 format_text/export.c:630 format_text/export.c:653 -#: format_text/export.c:659 format_text/export.c:662 format_text/export.c:667 -#: format_text/export.c:669 format_text/export.c:671 format_text/export.c:673 -#: format_text/export.c:675 format_text/export.c:679 format_text/export.c:682 -#: format_text/export.c:705 format_text/export.c:732 format_text/export.c:750 -#: format_text/flags.c:91 format_text/flags.c:135 -#: format_text/format-text.c:128 format_text/format-text.c:176 -#: format_text/format-text.c:203 format_text/format-text.c:244 -#: format_text/format-text.c:249 format_text/format-text.c:257 -#: format_text/format-text.c:275 format_text/format-text.c:280 -#: format_text/format-text.c:305 format_text/format-text.c:315 -#: format_text/format-text.c:362 format_text/format-text.c:367 -#: format_text/format-text.c:402 format_text/format-text.c:415 -#: format_text/format-text.c:432 format_text/format-text.c:463 -#: format_text/format-text.c:494 format_text/format-text.c:532 -#: format_text/format-text.c:546 format_text/format-text.c:551 -#: format_text/format-text.c:574 format_text/format-text.c:588 -#: format_text/format-text.c:833 format_text/format-text.c:838 -#: format_text/format-text.c:847 format_text/format-text.c:858 -#: format_text/format-text.c:871 format_text/format-text.c:1063 -#: format_text/format-text.c:1119 format_text/format-text.c:1124 -#: format_text/format-text.c:1134 format_text/format-text.c:1136 -#: format_text/format-text.c:1144 format_text/format-text.c:1184 -#: format_text/format-text.c:1190 format_text/format-text.c:1366 -#: format_text/format-text.c:1372 format_text/format-text.c:1391 -#: format_text/format-text.c:1426 format_text/format-text.c:1445 -#: format_text/format-text.c:1461 format_text/format-text.c:1466 -#: format_text/format-text.c:1480 format_text/format-text.c:1492 -#: format_text/format-text.c:1498 format_text/format-text.c:1529 -#: format_text/format-text.c:1534 format_text/format-text.c:1539 -#: format_text/format-text.c:1548 format_text/format-text.c:1651 +#: format_pool/format_pool.c:149 format_pool/format_pool.c:159 +#: format_pool/format_pool.c:168 format_pool/format_pool.c:173 +#: format_pool/format_pool.c:193 format_pool/format_pool.c:202 +#: format_pool/format_pool.c:208 format_pool/format_pool.c:238 +#: format_pool/format_pool.c:243 format_pool/format_pool.c:253 +#: format_pool/format_pool.c:258 format_pool/import_export.c:97 +#: format_pool/import_export.c:223 format_pool/import_export.c:260 +#: format_pool/import_export.c:296 format_pool/import_export.c:301 +#: format_text/archive.c:122 format_text/archive.c:142 +#: format_text/archive.c:169 format_text/archive.c:264 +#: format_text/archive.c:374 format_text/export.c:257 format_text/export.c:258 +#: format_text/export.c:259 format_text/export.c:262 format_text/export.c:264 +#: format_text/export.c:267 format_text/export.c:277 format_text/export.c:281 +#: format_text/export.c:283 format_text/export.c:286 format_text/export.c:289 +#: format_text/export.c:293 format_text/export.c:296 format_text/export.c:300 +#: format_text/export.c:304 format_text/export.c:307 format_text/export.c:308 +#: format_text/export.c:313 format_text/export.c:338 format_text/export.c:345 +#: format_text/export.c:350 format_text/export.c:354 format_text/export.c:358 +#: format_text/export.c:360 format_text/export.c:366 format_text/export.c:369 +#: format_text/export.c:373 format_text/export.c:376 format_text/export.c:379 +#: format_text/export.c:382 format_text/export.c:387 format_text/export.c:391 +#: format_text/export.c:400 format_text/export.c:403 format_text/export.c:406 +#: format_text/export.c:411 format_text/export.c:415 format_text/export.c:418 +#: format_text/export.c:423 format_text/export.c:428 format_text/export.c:441 +#: format_text/export.c:448 format_text/export.c:452 format_text/export.c:457 +#: format_text/export.c:465 format_text/export.c:488 format_text/export.c:492 +#: format_text/export.c:496 format_text/export.c:500 format_text/export.c:504 +#: format_text/export.c:505 format_text/export.c:511 format_text/export.c:533 +#: format_text/export.c:538 format_text/export.c:553 format_text/export.c:575 +#: format_text/export.c:582 format_text/export.c:587 format_text/export.c:591 +#: format_text/export.c:594 format_text/export.c:597 format_text/export.c:601 +#: format_text/export.c:604 format_text/export.c:608 format_text/export.c:612 +#: format_text/export.c:614 format_text/export.c:616 format_text/export.c:617 +#: format_text/export.c:623 format_text/export.c:629 format_text/export.c:633 +#: format_text/export.c:638 format_text/export.c:656 format_text/export.c:661 +#: format_text/export.c:670 format_text/export.c:675 format_text/export.c:680 +#: format_text/export.c:703 format_text/export.c:709 format_text/export.c:712 +#: format_text/export.c:717 format_text/export.c:721 format_text/export.c:725 +#: format_text/export.c:729 format_text/export.c:732 format_text/export.c:755 +#: format_text/export.c:783 format_text/export.c:796 format_text/flags.c:88 +#: format_text/flags.c:132 format_text/format-text.c:128 +#: format_text/format-text.c:176 format_text/format-text.c:198 +#: format_text/format-text.c:219 format_text/format-text.c:232 +#: format_text/format-text.c:240 format_text/format-text.c:257 +#: format_text/format-text.c:262 format_text/format-text.c:267 +#: format_text/format-text.c:287 format_text/format-text.c:296 +#: format_text/format-text.c:338 format_text/format-text.c:343 +#: format_text/format-text.c:388 format_text/format-text.c:401 +#: format_text/format-text.c:418 format_text/format-text.c:447 +#: format_text/format-text.c:473 format_text/format-text.c:500 +#: format_text/format-text.c:514 format_text/format-text.c:519 +#: format_text/format-text.c:542 format_text/format-text.c:556 +#: format_text/format-text.c:793 format_text/format-text.c:798 +#: format_text/format-text.c:807 format_text/format-text.c:818 +#: format_text/format-text.c:831 format_text/format-text.c:1014 +#: format_text/format-text.c:1072 format_text/format-text.c:1077 +#: format_text/format-text.c:1088 format_text/format-text.c:1090 +#: format_text/format-text.c:1098 format_text/format-text.c:1168 +#: format_text/format-text.c:1174 format_text/format-text.c:1353 +#: format_text/format-text.c:1359 format_text/format-text.c:1378 +#: format_text/format-text.c:1412 format_text/format-text.c:1432 +#: format_text/format-text.c:1450 format_text/format-text.c:1455 +#: format_text/format-text.c:1469 format_text/format-text.c:1482 +#: format_text/format-text.c:1488 format_text/format-text.c:1519 +#: format_text/format-text.c:1524 format_text/format-text.c:1529 +#: format_text/format-text.c:1538 format_text/format-text.c:1641 #: format_text/import.c:53 format_text/import.c:72 -#: format_text/import_vsn1.c:124 format_text/import_vsn1.c:135 -#: format_text/import_vsn1.c:168 format_text/import_vsn1.c:214 -#: format_text/import_vsn1.c:280 format_text/import_vsn1.c:286 -#: format_text/import_vsn1.c:299 format_text/import_vsn1.c:364 -#: format_text/import_vsn1.c:406 format_text/import_vsn1.c:434 -#: format_text/import_vsn1.c:442 format_text/import_vsn1.c:459 -#: format_text/import_vsn1.c:466 format_text/import_vsn1.c:495 -#: format_text/import_vsn1.c:553 format_text/import_vsn1.c:606 +#: format_text/import_vsn1.c:123 format_text/import_vsn1.c:134 +#: format_text/import_vsn1.c:167 format_text/import_vsn1.c:276 +#: format_text/import_vsn1.c:282 format_text/import_vsn1.c:301 +#: format_text/import_vsn1.c:413 format_text/import_vsn1.c:441 +#: format_text/import_vsn1.c:449 format_text/import_vsn1.c:466 +#: format_text/import_vsn1.c:473 format_text/import_vsn1.c:502 +#: format_text/import_vsn1.c:558 format_text/import_vsn1.c:606 #: format_text/import_vsn1.c:631 format_text/import_vsn1.c:641 #: format_text/import_vsn1.c:646 format_text/import_vsn1.c:716 #: format_text/tags.c:29 format_text/tags.c:36 format_text/tags.c:43 #: format_text/tags.c:49 format_text/tags.c:68 label/label.c:91 -#: label/label.c:122 label/label.c:193 label/label.c:214 label/label.c:265 -#: label/label.c:279 label/label.c:314 label/label.c:322 label/label.c:334 -#: label/label.c:346 locking/cluster_locking.c:85 +#: label/label.c:125 label/label.c:190 label/label.c:212 label/label.c:264 +#: label/label.c:278 label/label.c:313 label/label.c:321 label/label.c:333 +#: label/label.c:345 locking/cluster_locking.c:85 #: locking/cluster_locking.c:424 locking/cluster_locking.c:436 #: locking/cluster_locking.c:440 locking/external_locking.c:76 lvchange.c:49 -#: lvchange.c:87 lvchange.c:93 lvchange.c:107 lvchange.c:114 lvchange.c:121 -#: lvchange.c:171 lvchange.c:179 lvchange.c:213 lvchange.c:298 lvchange.c:356 -#: lvchange.c:364 lvconvert.c:43 lvconvert.c:73 lvconvert.c:90 lvconvert.c:219 -#: lvcreate.c:141 lvcreate.c:309 lvcreate.c:333 lvcreate.c:349 lvcreate.c:469 -#: lvcreate.c:557 lvcreate.c:611 lvcreate.c:618 lvcreate.c:623 lvcreate.c:629 -#: lvcreate.c:636 lvcreate.c:663 lvcreate.c:703 lvcreate.c:711 lvcreate.c:717 -#: lvcreate.c:724 lvcreate.c:814 lvmcmdline.c:946 lvremove.c:86 lvrename.c:87 -#: lvrename.c:144 lvrename.c:155 lvrename.c:162 lvrename.c:167 lvresize.c:417 -#: lvresize.c:474 lvresize.c:481 lvresize.c:488 lvresize.c:500 lvresize.c:507 -#: lvresize.c:513 lvresize.c:532 lvresize.c:546 lvresize.c:571 -#: metadata/lv_manip.c:73 metadata/lv_manip.c:171 metadata/lv_manip.c:206 -#: metadata/lv_manip.c:272 metadata/lv_manip.c:281 metadata/lv_manip.c:296 -#: metadata/lv_manip.c:305 metadata/lv_manip.c:332 metadata/lv_manip.c:468 -#: metadata/lv_manip.c:476 metadata/lv_manip.c:511 metadata/lv_manip.c:720 -#: metadata/lv_manip.c:768 metadata/lv_manip.c:793 metadata/lv_manip.c:805 -#: metadata/lv_manip.c:816 metadata/lv_manip.c:897 metadata/lv_manip.c:905 -#: metadata/lv_manip.c:942 metadata/lv_manip.c:954 metadata/lv_manip.c:983 -#: metadata/lv_manip.c:993 metadata/lv_manip.c:1039 metadata/lv_manip.c:1069 -#: metadata/lv_manip.c:1076 metadata/lv_manip.c:1189 metadata/merge.c:207 -#: metadata/merge.c:246 metadata/merge.c:251 metadata/metadata.c:105 -#: metadata/metadata.c:131 metadata/metadata.c:158 metadata/metadata.c:228 -#: metadata/metadata.c:252 metadata/metadata.c:346 metadata/metadata.c:352 -#: metadata/metadata.c:358 metadata/metadata.c:369 metadata/metadata.c:375 -#: metadata/metadata.c:387 metadata/metadata.c:393 metadata/metadata.c:405 -#: metadata/metadata.c:413 metadata/metadata.c:420 metadata/metadata.c:427 -#: metadata/metadata.c:434 metadata/metadata.c:447 metadata/metadata.c:455 -#: metadata/metadata.c:464 metadata/metadata.c:495 metadata/metadata.c:510 -#: metadata/metadata.c:692 metadata/metadata.c:731 metadata/metadata.c:759 -#: metadata/metadata.c:765 metadata/metadata.c:772 metadata/metadata.c:783 -#: metadata/metadata.c:788 metadata/metadata.c:810 metadata/metadata.c:832 -#: metadata/metadata.c:849 metadata/metadata.c:915 metadata/metadata.c:920 -#: metadata/metadata.c:965 metadata/metadata.c:1005 metadata/metadata.c:1188 -#: metadata/metadata.c:1222 metadata/metadata.c:1274 metadata/metadata.c:1307 -#: metadata/mirror.c:34 metadata/mirror.c:53 metadata/mirror.c:58 -#: metadata/mirror.c:72 metadata/mirror.c:186 metadata/mirror.c:225 -#: metadata/mirror.c:234 metadata/mirror.c:362 metadata/mirror.c:383 -#: metadata/mirror.c:388 metadata/mirror.c:462 metadata/pv_manip.c:55 -#: metadata/pv_manip.c:74 metadata/pv_manip.c:95 metadata/pv_manip.c:132 -#: metadata/pv_manip.c:157 metadata/pv_manip.c:198 metadata/pv_map.c:42 -#: metadata/pv_map.c:90 metadata/pv_map.c:110 metadata/pv_map.c:120 -#: metadata/pv_map.c:138 metadata/pv_map.c:148 metadata/snapshot_manip.c:56 -#: metadata/snapshot_manip.c:63 mirror/mirrored.c:137 mirror/mirrored.c:142 -#: mirror/mirrored.c:144 mirror/mirrored.c:225 mirror/mirrored.c:305 -#: misc/lvm-string.c:152 pvchange.c:185 pvmove.c:98 pvmove.c:103 pvmove.c:188 -#: pvmove.c:216 pvmove.c:223 pvmove.c:287 pvmove.c:294 pvmove.c:303 -#: pvmove.c:332 pvmove.c:345 pvmove.c:352 pvmove.c:359 pvmove.c:367 -#: pvmove.c:379 pvmove.c:520 pvscan.c:54 regex/matcher.c:182 +#: lvchange.c:87 lvchange.c:93 lvchange.c:101 lvchange.c:108 lvchange.c:115 +#: lvchange.c:165 lvchange.c:173 lvchange.c:207 lvchange.c:292 lvchange.c:350 +#: lvchange.c:358 lvcreate.c:265 lvcreate.c:436 lvcreate.c:517 lvcreate.c:523 +#: lvcreate.c:564 lvcreate.c:571 lvcreate.c:656 lvmcmdline.c:1004 +#: lvremove.c:74 lvrename.c:146 lvrename.c:157 lvrename.c:164 lvrename.c:169 +#: lvresize.c:360 lvresize.c:417 lvresize.c:424 lvresize.c:431 lvresize.c:443 +#: lvresize.c:450 lvresize.c:456 lvresize.c:475 lvresize.c:489 lvresize.c:514 +#: metadata/lv_manip.c:70 metadata/lv_manip.c:202 metadata/lv_manip.c:237 +#: metadata/lv_manip.c:324 metadata/lv_manip.c:369 metadata/lv_manip.c:462 +#: metadata/lv_manip.c:599 metadata/lv_manip.c:641 metadata/lv_manip.c:652 +#: metadata/lv_manip.c:700 metadata/lv_manip.c:714 metadata/merge.c:179 +#: metadata/metadata.c:174 metadata/metadata.c:198 metadata/metadata.c:266 +#: metadata/metadata.c:281 metadata/metadata.c:471 metadata/metadata.c:512 +#: metadata/metadata.c:518 metadata/metadata.c:524 metadata/metadata.c:548 +#: metadata/metadata.c:573 metadata/metadata.c:591 metadata/metadata.c:654 +#: metadata/metadata.c:659 metadata/metadata.c:692 metadata/metadata.c:834 +#: metadata/metadata.c:913 metadata/metadata.c:946 metadata/mirror.c:48 +#: metadata/mirror.c:88 metadata/mirror.c:97 metadata/mirror.c:247 +#: metadata/mirror.c:327 metadata/pv_map.c:33 metadata/pv_map.c:40 +#: metadata/pv_map.c:95 metadata/pv_map.c:115 metadata/pv_map.c:172 +#: metadata/pv_map.c:199 metadata/pv_map.c:217 metadata/pv_map.c:226 +#: metadata/pv_map.c:244 metadata/pv_map.c:258 metadata/snapshot_manip.c:124 +#: metadata/snapshot_manip.c:143 mirror/mirrored.c:96 mirror/mirrored.c:171 +#: mirror/mirrored.c:251 misc/lvm-string.c:152 pvmove.c:98 pvmove.c:103 +#: pvmove.c:179 pvmove.c:207 pvmove.c:214 pvmove.c:278 pvmove.c:285 +#: pvmove.c:294 pvmove.c:323 pvmove.c:336 pvmove.c:343 pvmove.c:350 +#: pvmove.c:358 pvmove.c:370 pvmove.c:511 pvscan.c:54 regex/matcher.c:182 #: regex/matcher.c:203 regex/matcher.c:208 regex/matcher.c:282 #: regex/matcher.c:287 regex/matcher.c:300 regex/matcher.c:322 #: regex/parse_rx.c:229 regex/parse_rx.c:280 regex/parse_rx.c:305 #: regex/parse_rx.c:328 regex/parse_rx.c:340 regex/ttree.c:91 -#: regex/ttree.c:111 report/report.c:576 report/report.c:604 -#: report/report.c:736 snapshot/snapshot.c:75 snapshot/snapshot.c:84 +#: regex/ttree.c:111 report/report.c:522 report/report.c:550 +#: report/report.c:682 snapshot/snapshot.c:75 snapshot/snapshot.c:84 #: snapshot/snapshot.c:85 snapshot/snapshot.c:86 snapshot/snapshot.c:155 -#: striped/striped.c:92 striped/striped.c:171 striped/striped.c:220 -#: toollib.c:760 toollib.c:810 toollib.c:857 uuid/uuid.c:91 uuid/uuid.c:95 -#: vgcfgbackup.c:65 vgcfgbackup.c:74 vgcfgbackup.c:81 vgchange.c:302 -#: vgmerge.c:160 vgreduce.c:28 vgreduce.c:90 vgreduce.c:96 vgreduce.c:104 -#: vgreduce.c:140 vgreduce.c:156 zero/zero.c:90 +#: striped/striped.c:90 striped/striped.c:160 striped/striped.c:209 +#: toollib.c:734 toollib.c:784 toollib.c:831 uuid/uuid.c:91 uuid/uuid.c:95 +#: vgcfgbackup.c:65 vgcfgbackup.c:74 vgcfgbackup.c:81 vgreduce.c:28 +#: vgreduce.c:84 vgreduce.c:92 vgreduce.c:98 vgreduce.c:106 vgreduce.c:142 +#: vgreduce.c:158 zero/zero.c:90 msgid "" msgstr "" @@ -350,32 +316,32 @@ msgid "Failed to get %s target version" msgstr "" -#: activate/activate.c:563 +#: activate/activate.c:567 #, c-format msgid "Skipping: Suspending '%s'." msgstr "" -#: activate/activate.c:609 +#: activate/activate.c:613 #, c-format msgid "Skipping: Resuming '%s'." msgstr "" -#: activate/activate.c:654 +#: activate/activate.c:658 #, c-format msgid "Skipping: Deactivating '%s'." msgstr "" -#: activate/activate.c:667 +#: activate/activate.c:671 #, c-format msgid "LV %s/%s in use: not removing" msgstr "" -#: activate/activate.c:693 activate/activate.c:717 +#: activate/activate.c:697 activate/activate.c:721 #, c-format msgid "Not activating %s/%s due to config file settings" msgstr "" -#: activate/activate.c:723 +#: activate/activate.c:727 #, c-format msgid "Skipping: Activating '%s'." msgstr "" @@ -402,8 +368,8 @@ msgid "Couldn't split up dm layer name %s" msgstr "" -#: activate/dev_manager.c:464 format_text/format-text.c:681 -#: format_text/format-text.c:706 format_text/format-text.c:740 +#: activate/dev_manager.c:464 format_text/format-text.c:640 +#: format_text/format-text.c:665 format_text/format-text.c:699 #, c-format msgid "Renaming %s to %s" msgstr "" @@ -494,135 +460,152 @@ msgid "Adding target: %llu %llu %s %s" msgstr "" -#: activate/dev_manager.c:736 +#: activate/dev_manager.c:759 #, c-format -msgid "%s device layer %s missing from hash" +msgid "device layer %s missing from hash" msgstr "" -#: activate/dev_manager.c:743 +#: activate/dev_manager.c:766 #, c-format -msgid "Failed to format %s device number for %s as dm target (%u,%u)" +msgid "Failed to format device number as dm target (%u,%u)" msgstr "" -#: activate/dev_manager.c:829 -#, c-format -msgid "Internal error: Unassigned area found in LV %s." -msgstr "" - -#: activate/dev_manager.c:852 +#: activate/dev_manager.c:795 msgid "Insufficient space for target parameters." msgstr "" -#: activate/dev_manager.c:865 -msgid "Insufficient space in params[%zu] for target parameters." +#: activate/dev_manager.c:808 +#, c-format +msgid "Insufficient space in params[%Zu] for target parameters." msgstr "" -#: activate/dev_manager.c:871 +#: activate/dev_manager.c:814 msgid "Target parameter size too big. Aborting." msgstr "" -#: activate/dev_manager.c:885 +#: activate/dev_manager.c:830 #, c-format msgid "Unable to build table for '%s'" msgstr "" -#: activate/dev_manager.c:909 +#: activate/dev_manager.c:851 +#, c-format +msgid "Couldn't find real device layer %s in hash" +msgstr "" + +#: activate/dev_manager.c:857 activate/dev_manager.c:911 +#, c-format +msgid "Couldn't create origin device parameters for '%s'." +msgstr "" + +#: activate/dev_manager.c:862 #, c-format msgid "Adding target: 0 %llu snapshot-origin %s" msgstr "" -#: activate/dev_manager.c:930 +#: activate/dev_manager.c:884 #, c-format msgid "Couldn't find snapshot for '%s'." msgstr "" -#: activate/dev_manager.c:964 +#: activate/dev_manager.c:899 +#, c-format +msgid "Couldn't find origin device layer %s in hash" +msgstr "" + +#: activate/dev_manager.c:905 +#, c-format +msgid "Couldn't find cow device layer %s in hash" +msgstr "" + +#: activate/dev_manager.c:918 +#, c-format +msgid "Couldn't create cow device parameters for '%s'." +msgstr "" + +#: activate/dev_manager.c:931 #, c-format msgid "Adding target: 0 %llu snapshot %s" msgstr "" -#: activate/dev_manager.c:1048 activate/dev_manager.c:1128 +#: activate/dev_manager.c:1015 activate/dev_manager.c:1095 #, c-format msgid "Getting device info for %s" msgstr "" -#: activate/dev_manager.c:1074 +#: activate/dev_manager.c:1041 #, c-format msgid "Getting device status percentage for %s" msgstr "" -#: activate/dev_manager.c:1105 +#: activate/dev_manager.c:1072 #, c-format msgid "Getting device mirror status percentage for %s" msgstr "" -#: activate/dev_manager.c:1405 activate/dev_manager.c:1411 -msgid "Clustered snapshots are not yet supported" -msgstr "" - -#: activate/dev_manager.c:1448 activate/dev_manager.c:1608 +#: activate/dev_manager.c:1395 activate/dev_manager.c:1555 #, c-format msgid "Couldn't find device layer '%s'." msgstr "" -#: activate/dev_manager.c:1528 +#: activate/dev_manager.c:1475 #, c-format msgid "_suspend_parents couldn't find device layer '%s' - skipping." msgstr "" -#: activate/dev_manager.c:1534 +#: activate/dev_manager.c:1481 #, c-format msgid "BUG: pre-suspend loop detected (%s)" msgstr "" -#: activate/dev_manager.c:1562 +#: activate/dev_manager.c:1509 #, c-format msgid "_resume_with_deps couldn't find device layer '%s' - skipping." msgstr "" -#: activate/dev_manager.c:1568 activate/dev_manager.c:1613 +#: activate/dev_manager.c:1515 activate/dev_manager.c:1560 #, c-format msgid "BUG: pre-create loop detected (%s)" msgstr "" -#: activate/dev_manager.c:1720 activate/dev_manager.c:1736 +#: activate/dev_manager.c:1667 activate/dev_manager.c:1683 #, c-format msgid "" "_populate_pre_suspend_lists: Couldn't find device layer '%s' - skipping." msgstr "" -#: activate/dev_manager.c:1782 +#: activate/dev_manager.c:1729 #, c-format msgid "Couldn't deactivate device %s" msgstr "" -#: activate/dev_manager.c:1898 +#: activate/dev_manager.c:1846 #, c-format msgid "Found existing layer '%s'" msgstr "" -#: activate/dev_manager.c:2078 +#: activate/dev_manager.c:2025 #, c-format msgid "Can't expand LV: %s target support missing from kernel?" msgstr "" -#: activate/dev_manager.c:2090 +#: activate/dev_manager.c:2037 msgid "Can't expand LV: Mirror support missing from tools?" msgstr "" -#: activate/dev_manager.c:2097 +#: activate/dev_manager.c:2044 msgid "Can't expand LV: Mirror support missing from kernel?" msgstr "" -#: activate/dev_manager.c:2105 +#: activate/dev_manager.c:2052 msgid "Can't expand LV: Snapshot support missing from tools?" msgstr "" -#: activate/dev_manager.c:2112 +#: activate/dev_manager.c:2059 msgid "Can't expand LV: Snapshot support missing from kernel?" msgstr "" -#: activate/dev_manager.c:2140 +#: activate/dev_manager.c:2087 #, c-format msgid "Found active lv %s%s" msgstr "" @@ -638,31 +621,30 @@ #: activate/fs.c:50 activate/fs.c:85 activate/fs.c:105 activate/fs.c:158 #: activate/fs.c:171 activate/fs.c:178 activate/fs.c:213 -#: commands/toolcontext.c:342 commands/toolcontext.c:799 config/config.c:155 +#: commands/toolcontext.c:340 commands/toolcontext.c:781 config/config.c:155 #: config/config.c:204 config/config.c:220 config/config.c:285 -#: config/config.c:382 device/dev-cache.c:172 device/dev-cache.c:176 -#: device/dev-cache.c:358 device/dev-cache.c:381 device/dev-cache.c:388 -#: device/dev-cache.c:581 device/dev-cache.c:583 device/dev-io.c:131 -#: device/dev-io.c:231 device/dev-io.c:249 device/dev-io.c:254 -#: device/dev-io.c:256 device/dev-io.c:262 device/dev-io.c:386 -#: device/dev-io.c:388 device/dev-io.c:451 filters/filter-persistent.c:186 +#: config/config.c:382 device/dev-cache.c:150 device/dev-cache.c:154 +#: device/dev-cache.c:322 device/dev-cache.c:329 device/dev-cache.c:490 +#: device/dev-cache.c:492 device/dev-io.c:131 device/dev-io.c:235 +#: device/dev-io.c:240 device/dev-io.c:242 device/dev-io.c:248 +#: device/dev-io.c:344 device/dev-io.c:400 filters/filter-persistent.c:184 #: filters/filter-sysfs.c:43 filters/filter-sysfs.c:155 -#: filters/filter-sysfs.c:179 filters/filter-sysfs.c:222 filters/filter.c:153 -#: format_text/archive.c:216 format_text/archive.c:225 -#: format_text/format-text.c:656 format_text/format-text.c:670 -#: format_text/format-text.c:676 format_text/format-text.c:701 -#: format_text/format-text.c:763 format_text/format-text.c:768 -#: format_text/format-text.c:793 format_text/format-text.c:818 +#: filters/filter-sysfs.c:179 filters/filter-sysfs.c:222 filters/filter.c:152 +#: format_text/archive.c:221 format_text/archive.c:230 +#: format_text/format-text.c:615 format_text/format-text.c:629 +#: format_text/format-text.c:635 format_text/format-text.c:660 +#: format_text/format-text.c:722 format_text/format-text.c:727 +#: format_text/format-text.c:753 format_text/format-text.c:778 #: locking/file_locking.c:61 locking/file_locking.c:69 -#: locking/file_locking.c:72 locking/file_locking.c:105 -#: locking/file_locking.c:171 locking/file_locking.c:187 -#: locking/file_locking.c:294 locking/file_locking.c:299 locking/locking.c:44 -#: locking/locking.c:49 locking/locking.c:65 locking/locking.c:203 -#: log/log.c:64 lvmcmdline.c:1347 misc/lvm-file.c:47 misc/lvm-file.c:96 -#: misc/lvm-file.c:106 misc/lvm-file.c:156 misc/lvm-file.c:169 -#: misc/lvm-file.c:198 misc/lvm-file.c:207 misc/lvm-file.c:235 -#: misc/lvm-file.c:240 mm/memlock.c:98 mm/memlock.c:106 mm/memlock.c:117 -#: toollib.c:992 uuid/uuid.c:84 uuid/uuid.c:89 +#: locking/file_locking.c:72 locking/file_locking.c:103 +#: locking/file_locking.c:169 locking/file_locking.c:183 +#: locking/file_locking.c:290 locking/file_locking.c:295 locking/locking.c:44 +#: locking/locking.c:49 locking/locking.c:65 locking/locking.c:200 +#: log/log.c:62 lvmcmdline.c:1411 misc/lvm-file.c:47 misc/lvm-file.c:92 +#: misc/lvm-file.c:102 misc/lvm-file.c:151 misc/lvm-file.c:163 +#: misc/lvm-file.c:192 misc/lvm-file.c:201 misc/lvm-file.c:229 +#: misc/lvm-file.c:234 mm/memlock.c:98 mm/memlock.c:106 mm/memlock.c:117 +#: toollib.c:966 uuid/uuid.c:84 uuid/uuid.c:89 #, c-format msgid "%s: %s failed: %s" msgstr "" @@ -730,11 +712,11 @@ msgid "No space to stack fs operation" msgstr "" -#: archiver.c:40 format_text/archiver.c:53 +#: archiver.c:43 msgid "Couldn't copy archive directory name." msgstr "" -#: archiver.c:102 format_text/archiver.c:116 +#: archiver.c:105 msgid "Test mode: Skipping archiving of volume group." msgstr "" @@ -743,45 +725,45 @@ msgid "Archiving volume group \"%s\" metadata." msgstr "" -#: archiver.c:111 format_text/archiver.c:131 +#: archiver.c:111 #, c-format msgid "Volume group \"%s\" metadata archive failed." msgstr "" -#: archiver.c:138 format_text/archiver.c:164 +#: archiver.c:141 msgid "Couldn't copy backup directory name." msgstr "" -#: archiver.c:169 format_text/archiver.c:195 +#: archiver.c:172 msgid "Failed to generate volume group metadata backup filename." msgstr "" -#: archiver.c:180 format_text/archiver.c:206 +#: archiver.c:183 msgid "WARNING: This metadata update is NOT backed up" msgstr "" -#: archiver.c:185 format_text/archiver.c:211 +#: archiver.c:188 msgid "Test mode: Skipping volume group backup." msgstr "" -#: archiver.c:193 format_text/archiver.c:224 +#: archiver.c:193 #, c-format msgid "Backup of volume group %s metadata failed." msgstr "" -#: archiver.c:207 format_text/archiver.c:238 +#: archiver.c:207 msgid "Failed to generate backup filename (for removal)." msgstr "" -#: archiver.c:230 format_text/archiver.c:261 +#: archiver.c:230 msgid "Couldn't create text format object." msgstr "" -#: archiver.c:259 format_text/archiver.c:290 +#: archiver.c:259 msgid "Failed to allocate format instance" msgstr "" -#: archiver.c:267 format_text/archiver.c:298 +#: archiver.c:267 #, c-format msgid "PV %s missing from cache" msgstr "" @@ -791,12 +773,12 @@ msgid "PV %s is a different format (%s)" msgstr "" -#: archiver.c:279 format_text/archiver.c:310 +#: archiver.c:279 #, c-format msgid "Format-specific setup for %s failed" msgstr "" -#: archiver.c:316 format_text/archiver.c:347 +#: archiver.c:316 msgid "Failed to generate backup filename (for restore)." msgstr "" @@ -805,11 +787,11 @@ msgid "Creating volume group backup \"%s\"" msgstr "" -#: archiver.c:338 format_text/archiver.c:369 +#: archiver.c:338 msgid "Couldn't create backup object." msgstr "" -#: cache/lvmcache.c:57 cache/lvmcache.c:202 cache/lvmcache.c:464 +#: cache/lvmcache.c:57 cache/lvmcache.c:182 cache/lvmcache.c:444 msgid "Internal cache initialisation failed" msgstr "" @@ -818,283 +800,247 @@ msgid "Cache locking failure for %s" msgstr "" -#: cache/lvmcache.c:212 toollib.c:492 +#: cache/lvmcache.c:192 toollib.c:467 msgid "dev_iter creation failed" msgstr "" -#: cache/lvmcache.c:245 +#: cache/lvmcache.c:226 msgid "vgnames list allocation failed" msgstr "" -#: cache/lvmcache.c:252 toollib.c:150 toollib.c:195 toollib.c:203 -#: toollib.c:215 toollib.c:275 toollib.c:406 toollib.c:426 toollib.c:552 +#: cache/lvmcache.c:233 toollib.c:147 toollib.c:192 toollib.c:200 +#: toollib.c:212 toollib.c:272 toollib.c:381 toollib.c:401 toollib.c:526 msgid "strlist allocation failed" msgstr "" -#: cache/lvmcache.c:346 +#: cache/lvmcache.c:327 #, c-format msgid "_lvmcache_update: pvid insertion failed: %s" msgstr "" -#: cache/lvmcache.c:367 +#: cache/lvmcache.c:348 #, c-format msgid "_lvmcache_update: vgid hash insertion failed: %s" msgstr "" -#: cache/lvmcache.c:395 +#: cache/lvmcache.c:376 msgid "lvmcache_update_vgname: list alloc failed" msgstr "" -#: cache/lvmcache.c:401 +#: cache/lvmcache.c:382 #, c-format msgid "cache vgname alloc failed for %s" msgstr "" -#: cache/lvmcache.c:406 +#: cache/lvmcache.c:387 #, c-format msgid "cache_update: vg hash insertion failed: %s" msgstr "" -#: cache/lvmcache.c:425 -#, c-format -msgid "lvmcache: %s now %s%s" -msgstr "" - -#: cache/lvmcache.c:478 +#: cache/lvmcache.c:458 msgid "lvmcache_info allocation failed" msgstr "" -#: cache/lvmcache.c:493 +#: cache/lvmcache.c:473 #, c-format msgid "Ignoring duplicate PV %s on %s - using md %s" msgstr "" -#: cache/lvmcache.c:500 +#: cache/lvmcache.c:480 #, c-format msgid "Duplicate PV %s on %s - using md %s" msgstr "" -#: cache/lvmcache.c:505 +#: cache/lvmcache.c:485 #, c-format msgid "Found duplicate PV %s: using %s not %s" msgstr "" -#: cache/lvmcache.c:574 -msgid "Wiping internal VG cache" -msgstr "" - -#: commands/toolcontext.c:73 +#: commands/toolcontext.c:71 msgid "LVM_SYSTEM_DIR environment variable is too long." msgstr "" -#: commands/toolcontext.c:146 +#: commands/toolcontext.c:144 #, c-format msgid "Logging initialised at %s" msgstr "" -#: commands/toolcontext.c:165 +#: commands/toolcontext.c:163 #, c-format msgid "Set umask to %04o" msgstr "" -#: commands/toolcontext.c:171 commands/toolcontext.c:182 +#: commands/toolcontext.c:169 commands/toolcontext.c:180 msgid "Device directory given in config file too long" msgstr "" -#: commands/toolcontext.c:187 +#: commands/toolcontext.c:185 #, c-format msgid "Warning: proc dir %s not found - some checks will be bypassed" msgstr "" -#: commands/toolcontext.c:207 lvmcmdline.c:694 +#: commands/toolcontext.c:205 lvmcmdline.c:694 msgid "Invalid units specification" msgstr "" -#: commands/toolcontext.c:216 +#: commands/toolcontext.c:214 #, c-format msgid "Setting host tag: %s" msgstr "" -#: commands/toolcontext.c:219 +#: commands/toolcontext.c:217 #, c-format msgid "_set_tag: str_list_add %s failed" msgstr "" -#: commands/toolcontext.c:243 +#: commands/toolcontext.c:241 #, c-format msgid "Invalid hostname string for tag %s" msgstr "" -#: commands/toolcontext.c:254 +#: commands/toolcontext.c:252 msgid "host_filter not supported yet" msgstr "" -#: commands/toolcontext.c:289 +#: commands/toolcontext.c:287 #, c-format msgid "Invalid tag in config file: %s" msgstr "" -#: commands/toolcontext.c:322 +#: commands/toolcontext.c:320 msgid "LVM_SYSTEM_DIR or tag was too long" msgstr "" -#: commands/toolcontext.c:327 +#: commands/toolcontext.c:325 msgid "config_tree_list allocation failed" msgstr "" -#: commands/toolcontext.c:332 +#: commands/toolcontext.c:330 msgid "config_tree allocation failed" msgstr "" -#: commands/toolcontext.c:347 +#: commands/toolcontext.c:345 #, c-format msgid "Loading config file: %s" msgstr "" -#: commands/toolcontext.c:349 +#: commands/toolcontext.c:347 #, c-format msgid "Failed to load config file %s" msgstr "" -#: commands/toolcontext.c:372 commands/toolcontext.c:410 +#: commands/toolcontext.c:370 commands/toolcontext.c:408 msgid "Failed to create config tree" msgstr "" -#: commands/toolcontext.c:475 +#: commands/toolcontext.c:473 msgid "Failed to add /dev to internal device cache" msgstr "" -#: commands/toolcontext.c:479 +#: commands/toolcontext.c:477 msgid "device/scan not in config file: Defaulting to /dev" msgstr "" -#: commands/toolcontext.c:486 +#: commands/toolcontext.c:484 msgid "Invalid string in config file: devices/scan" msgstr "" -#: commands/toolcontext.c:492 format_text/format-text.c:1692 +#: commands/toolcontext.c:490 format_text/format-text.c:1681 #, c-format msgid "Failed to add %s to internal device cache" msgstr "" -#: commands/toolcontext.c:503 -msgid "Invalid string in config file: devices/loopfiles" -msgstr "" - -#: commands/toolcontext.c:509 -#, c-format -msgid "Failed to add loopfile %s to internal device cache" -msgstr "" - -#: commands/toolcontext.c:548 +#: commands/toolcontext.c:528 msgid "devices/filter not found in config file: no regex filter installed" msgstr "" -#: commands/toolcontext.c:552 +#: commands/toolcontext.c:532 msgid "Failed to create regex device filter" msgstr "" -#: commands/toolcontext.c:559 +#: commands/toolcontext.c:539 msgid "Failed to create lvm type filter" msgstr "" -#: commands/toolcontext.c:590 +#: commands/toolcontext.c:570 #, c-format msgid "Persistent cache filename too long ('%s/.cache')." msgstr "" -#: commands/toolcontext.c:598 +#: commands/toolcontext.c:578 msgid "Failed to create persistent device filter" msgstr "" -#: commands/toolcontext.c:612 +#: commands/toolcontext.c:592 #, c-format msgid "Failed to load existing device cache from %s" msgstr "" -#: commands/toolcontext.c:656 +#: commands/toolcontext.c:637 msgid "Invalid string in config file: global/format_libraries" msgstr "" -#: commands/toolcontext.c:667 +#: commands/toolcontext.c:648 #, c-format msgid "Shared library %s does not contain format functions" msgstr "" -#: commands/toolcontext.c:699 +#: commands/toolcontext.c:681 #, c-format msgid "_init_formats: Default format (%s) not found" msgstr "" -#: commands/toolcontext.c:752 +#: commands/toolcontext.c:734 msgid "Invalid string in config file: global/segment_libraries" msgstr "" -#: commands/toolcontext.c:763 +#: commands/toolcontext.c:745 #, c-format msgid "Shared library %s does not contain segment type functions" msgstr "" -#: commands/toolcontext.c:777 +#: commands/toolcontext.c:759 #, c-format msgid "Duplicate segment type %s: unloading shared library %s" msgstr "" -#: commands/toolcontext.c:804 +#: commands/toolcontext.c:786 msgid "_init_hostname: pool_strdup failed" msgstr "" -#: commands/toolcontext.c:809 +#: commands/toolcontext.c:791 msgid "_init_hostname: pool_strdup kernel_vsn failed" msgstr "" -#: commands/toolcontext.c:823 -msgid "WARNING: Metadata changes will NOT be backed up" -msgstr "" - -#: commands/toolcontext.c:843 -#, c-format -msgid "Couldn't create default archive path '%s/%s'." -msgstr "" - -#: commands/toolcontext.c:852 commands/toolcontext.c:872 -msgid "backup_init failed." -msgstr "" - -#: commands/toolcontext.c:864 -#, c-format -msgid "Couldn't create default backup path '%s/%s'." -msgstr "" - -#: commands/toolcontext.c:889 +#: commands/toolcontext.c:808 msgid "setlocale failed" msgstr "" -#: commands/toolcontext.c:898 +#: commands/toolcontext.c:817 msgid "Failed to allocate command context" msgstr "" -#: commands/toolcontext.c:916 +#: commands/toolcontext.c:835 msgid "" "Failed to create LVM2 system dir for metadata backups, config files and " "internal cache." msgstr "" -#: commands/toolcontext.c:918 +#: commands/toolcontext.c:837 msgid "" "Set environment variable LVM_SYSTEM_DIR to alternative location or empty " "string." msgstr "" -#: commands/toolcontext.c:924 +#: commands/toolcontext.c:843 msgid "Library memory pool creation failed" msgstr "" -#: commands/toolcontext.c:955 +#: commands/toolcontext.c:874 msgid "Command memory pool creation failed" msgstr "" -#: commands/toolcontext.c:1018 +#: commands/toolcontext.c:934 msgid "Reloading config files" msgstr "" @@ -1199,103 +1145,84 @@ msgid "%s not found in config: defaulting to %f" msgstr "" -#: device/dev-cache.c:65 device/dev-cache.c:82 device/dev-cache.c:119 +#: device/dev-cache.c:60 device/dev-cache.c:97 msgid "struct device allocation failed" msgstr "" -#: device/dev-cache.c:69 device/dev-cache.c:86 +#: device/dev-cache.c:64 msgid "struct str_list allocation failed" msgstr "" -#: device/dev-cache.c:74 device/dev-cache.c:91 device/dev-cache.c:96 +#: device/dev-cache.c:69 msgid "filename strdup failed" msgstr "" -#: device/dev-cache.c:211 -#, c-format -msgid "%s: Already in device cache" -msgstr "" - -#: device/dev-cache.c:224 +#: device/dev-cache.c:202 #, c-format msgid "%s: Aliased to %s in device cache%s" msgstr "" -#: device/dev-cache.c:228 +#: device/dev-cache.c:206 #, c-format msgid "%s: Added to device cache" msgstr "" -#: device/dev-cache.c:271 +#: device/dev-cache.c:234 msgid "Couldn't insert device into binary tree." msgstr "" -#: device/dev-cache.c:278 +#: device/dev-cache.c:241 msgid "Couldn't add alias to dev cache." msgstr "" -#: device/dev-cache.c:283 +#: device/dev-cache.c:246 msgid "Couldn't add name to hash in dev cache." msgstr "" -#: device/dev-cache.c:363 -#, c-format -msgid "%s: Not a regular file" -msgstr "" - -#: device/dev-cache.c:393 +#: device/dev-cache.c:334 #, c-format msgid "%s: Symbolic link to directory" msgstr "" -#: device/dev-cache.c:402 +#: device/dev-cache.c:343 #, c-format msgid "%s: Not a block device" msgstr "" -#: device/dev-cache.c:465 +#: device/dev-cache.c:405 msgid "Couldn't create binary tree for dev-cache." msgstr "" -#: device/dev-cache.c:482 +#: device/dev-cache.c:421 #, c-format msgid "Device '%s' has been left open." msgstr "" -#: device/dev-cache.c:517 device/dev-cache.c:543 +#: device/dev-cache.c:455 #, c-format msgid "Ignoring %s: %s" msgstr "" -#: device/dev-cache.c:523 +#: device/dev-cache.c:461 #, c-format msgid "Ignoring %s: Not a directory" msgstr "" -#: device/dev-cache.c:528 +#: device/dev-cache.c:466 msgid "dir_list allocation failed" msgstr "" -#: device/dev-cache.c:549 -#, c-format -msgid "Ignoring %s: Not a regular file" -msgstr "" - -#: device/dev-cache.c:554 -msgid "dir_list allocation failed for file" -msgstr "" - -#: device/dev-cache.c:586 device/dev-cache.c:590 +#: device/dev-cache.c:495 device/dev-cache.c:499 #, c-format msgid "Path %s no longer valid for device(%d,%d)" msgstr "" -#: device/dev-cache.c:607 +#: device/dev-cache.c:516 #, c-format msgid "Aborting - please provide new pathname for what used to be %s" msgstr "" -#: device/dev-cache.c:647 +#: device/dev-cache.c:548 msgid "dev_iter allocation failed" msgstr "" @@ -1328,57 +1255,54 @@ msgid "Bounce buffer alloca failed" msgstr "" -#: device/dev-io.c:238 device/dev-io.c:264 +#: device/dev-io.c:250 #, c-format msgid "%s: size is %llu sectors" msgstr "" -#: device/dev-io.c:333 +#: device/dev-io.c:307 #, c-format msgid "WARNING: %s already opened read-only" msgstr "" -#: device/dev-io.c:342 +#: device/dev-io.c:316 #, c-format msgid "WARNING: dev_open(%s) called while suspended" msgstr "" -#: device/dev-io.c:354 +#: device/dev-io.c:328 #, c-format msgid "%s: stat failed: Has device name changed?" msgstr "" -#: device/dev-io.c:380 -#, c-format -msgid "%s: Not using O_DIRECT" -msgstr "" - -#: device/dev-io.c:407 +#: device/dev-io.c:357 #, c-format msgid "%s: fstat failed: Has device name changed?" msgstr "" -#: device/dev-io.c:423 +#: device/dev-io.c:373 #, c-format -msgid "Opened %s %s%s" +msgid "Opened %s %s" msgstr "" -#: device/dev-io.c:456 +#: device/dev-io.c:405 #, c-format msgid "Closed %s" msgstr "" -#: device/dev-io.c:469 +#: device/dev-io.c:418 #, c-format msgid "Attempt to close device '%s' which is not open." msgstr "" -#: device/dev-io.c:579 -msgid "Wiping %s at %llu length %zu" +#: device/dev-io.c:528 +#, c-format +msgid "Wiping %s at %llu length %Zu" msgstr "" -#: device/dev-io.c:582 -msgid "Wiping %s at sector %llu length %zu sectors" +#: device/dev-io.c:531 +#, c-format +msgid "Wiping %s at sector %llu length %Zu sectors" msgstr "" #: display/display.c:130 @@ -1434,7 +1358,7 @@ msgid "PE Size (KByte) %u" msgstr "" -#: display/display.c:282 display/display.c:563 +#: display/display.c:282 display/display.c:573 #, c-format msgid "Total PE %u" msgstr "" @@ -1454,9 +1378,9 @@ msgid "PV UUID %s" msgstr "" -#: display/display.c:286 display/display.c:312 display/display.c:445 -#: display/display.c:496 display/display.c:582 format_text/archive.c:311 -#: lvmcmdline.c:729 mirror/mirrored.c:66 striped/striped.c:51 +#: display/display.c:286 display/display.c:312 display/display.c:459 +#: display/display.c:506 display/display.c:592 format_text/archive.c:316 +#: lvmcmdline.c:729 mirror/mirrored.c:54 striped/striped.c:50 msgid " " msgstr "" @@ -1480,272 +1404,257 @@ msgid "%s%s/%s:%s:%d:%d:-1:%d:%llu:%d:-1:%d:%d:%d:%d" msgstr "" -#: display/display.c:352 +#: display/display.c:353 msgid "--- Logical volume ---" msgstr "" -#: display/display.c:354 +#: display/display.c:355 #, c-format msgid "LV Name %s%s/%s" msgstr "" -#: display/display.c:356 +#: display/display.c:357 #, c-format msgid "VG Name %s" msgstr "" -#: display/display.c:358 +#: display/display.c:359 #, c-format msgid "LV UUID %s" msgstr "" -#: display/display.c:360 +#: display/display.c:361 #, c-format msgid "LV Write Access %s" msgstr "" -#: display/display.c:364 +#: display/display.c:365 msgid "LV snapshot status source of" msgstr "" -#: display/display.c:373 +#: display/display.c:374 #, c-format msgid " %s%s/%s [%s]" msgstr "" -#: display/display.c:386 +#: display/display.c:384 #, c-format msgid "LV snapshot status %s destination for %s%s/%s" msgstr "" -#: display/display.c:393 +#: display/display.c:391 msgid "LV Status suspended" msgstr "" -#: display/display.c:395 +#: display/display.c:393 #, c-format msgid "LV Status %savailable" msgstr "" -#: display/display.c:403 +#: display/display.c:401 #, c-format msgid "# open %u" msgstr "" -#: display/display.c:405 +#: display/display.c:403 #, c-format msgid "LV Size %s" msgstr "" -#: display/display.c:410 +#: display/display.c:408 #, c-format msgid "Current LE %u" msgstr "" -#: display/display.c:414 -#, c-format -msgid "COW-table size %s" -msgstr "" - -#: display/display.c:416 +#: display/display.c:415 #, c-format -msgid "COW-table LE %u" -msgstr "" - -#: display/display.c:419 -#, c-format -msgid "Allocated to snapshot %.2f%% " +msgid "Segments %u" msgstr "" -#: display/display.c:421 +#: display/display.c:425 #, c-format msgid "Snapshot chunk size %s" msgstr "" -#: display/display.c:426 +#: display/display.c:434 #, c-format -msgid "Segments %u" +msgid "Allocated to snapshot %.2f%% " msgstr "" -#: display/display.c:432 +#: display/display.c:446 #, c-format msgid "Allocation %s" msgstr "" -#: display/display.c:433 +#: display/display.c:447 #, c-format msgid "Read ahead sectors %u" msgstr "" -#: display/display.c:437 +#: display/display.c:451 #, c-format msgid "Persistent major %d" msgstr "" -#: display/display.c:438 +#: display/display.c:452 #, c-format msgid "Persistent minor %d" msgstr "" -#: display/display.c:442 +#: display/display.c:456 #, c-format msgid "Block device %d:%d" msgstr "" -#: display/display.c:455 +#: display/display.c:468 #, c-format msgid "%sPhysical volume\t%s" msgstr "" -#: display/display.c:461 +#: display/display.c:473 #, c-format msgid "%sPhysical extents\t%d to %d" msgstr "" -#: display/display.c:466 +#: display/display.c:478 #, c-format msgid "%sLogical volume\t%s" msgstr "" -#: display/display.c:471 +#: display/display.c:483 #, c-format msgid "%sLogical extents\t%d to %d" msgstr "" -#: display/display.c:476 -#, c-format -msgid "%sUnassigned area" -msgstr "" - -#: display/display.c:484 +#: display/display.c:494 msgid "--- Segments ---" msgstr "" -#: display/display.c:487 +#: display/display.c:497 #, c-format msgid "Logical extent %u to %u:" msgstr "" -#: display/display.c:490 +#: display/display.c:500 #, c-format msgid " Type\t\t%s" msgstr "" -#: display/display.c:516 +#: display/display.c:526 msgid "--- Volume group ---" msgstr "" -#: display/display.c:517 +#: display/display.c:527 #, c-format msgid "VG Name %s" msgstr "" -#: display/display.c:518 +#: display/display.c:528 #, c-format msgid "System ID %s" msgstr "" -#: display/display.c:519 +#: display/display.c:529 #, c-format msgid "Format %s" msgstr "" -#: display/display.c:521 +#: display/display.c:531 #, c-format msgid "Metadata Areas %d" msgstr "" -#: display/display.c:523 +#: display/display.c:533 #, c-format msgid "Metadata Sequence No %d" msgstr "" -#: display/display.c:526 +#: display/display.c:536 #, c-format msgid "VG Access %s%s%s%s" msgstr "" -#: display/display.c:531 +#: display/display.c:541 #, c-format msgid "VG Status %s%sresizable" msgstr "" -#: display/display.c:538 +#: display/display.c:548 msgid "Clustered yes" msgstr "" -#: display/display.c:539 +#: display/display.c:549 #, c-format msgid "Shared %s" msgstr "" -#: display/display.c:542 +#: display/display.c:552 #, c-format msgid "MAX LV %u" msgstr "" -#: display/display.c:543 +#: display/display.c:553 #, c-format msgid "Cur LV %u" msgstr "" -#: display/display.c:544 +#: display/display.c:554 #, c-format msgid "Open LV %u" msgstr "" -#: display/display.c:550 +#: display/display.c:560 #, c-format msgid "Max PV %u" msgstr "" -#: display/display.c:551 +#: display/display.c:561 #, c-format msgid "Cur PV %u" msgstr "" -#: display/display.c:552 +#: display/display.c:562 #, c-format msgid "Act PV %u" msgstr "" -#: display/display.c:554 +#: display/display.c:564 #, c-format msgid "VG Size %s" msgstr "" -#: display/display.c:559 +#: display/display.c:569 #, c-format msgid "PE Size %s" msgstr "" -#: display/display.c:565 +#: display/display.c:575 #, c-format msgid "Alloc PE / Size %u / %s" msgstr "" -#: display/display.c:571 +#: display/display.c:581 #, c-format msgid "Free PE / Size %u / %s" msgstr "" -#: display/display.c:581 +#: display/display.c:591 #, c-format msgid "VG UUID %s" msgstr "" -#: display/display.c:617 +#: display/display.c:627 #, c-format msgid "%s:%s:%d:-1:%u:%u:%u:-1:%u:%u:%u:%llu:%u:%u:%u:%u:%s" msgstr "" -#: display/display.c:641 +#: display/display.c:651 #, c-format msgid "\"%s\" %-9s [%-9s used / %s free]" msgstr "" -#: display/display.c:661 display/display.c:670 pvscan.c:33 -#: report/report.c:1325 report/report.c:1477 +#: display/display.c:671 display/display.c:680 pvscan.c:33 +#: report/report.c:1268 report/report.c:1423 #, c-format msgid "%s" msgstr "" @@ -1754,8 +1663,8 @@ msgid "Please specify one file for output" msgstr "" -#: error/errseg.c:100 mirror/mirrored.c:315 snapshot/snapshot.c:165 -#: striped/striped.c:231 zero/zero.c:100 +#: error/errseg.c:100 mirror/mirrored.c:261 snapshot/snapshot.c:165 +#: striped/striped.c:220 zero/zero.c:100 #, c-format msgid "Initialised segtype: %s" msgstr "" @@ -1787,40 +1696,36 @@ msgid "md filter allocation failed" msgstr "" -#: filters/filter-persistent.c:56 -msgid "Wiping cache of LVM-capable devices" -msgstr "" - -#: filters/filter-persistent.c:72 +#: filters/filter-persistent.c:70 #, c-format msgid "Couldn't find %s array in '%s'" msgstr "" -#: filters/filter-persistent.c:83 +#: filters/filter-persistent.c:81 msgid "Devices array contains a value which is not a string ... ignoring" msgstr "" -#: filters/filter-persistent.c:89 +#: filters/filter-persistent.c:87 #, c-format msgid "Couldn't add '%s' to filter ... ignoring" msgstr "" -#: filters/filter-persistent.c:127 +#: filters/filter-persistent.c:125 #, c-format msgid "Loaded persistent filter cache from %s" msgstr "" -#: filters/filter-persistent.c:171 +#: filters/filter-persistent.c:169 #, c-format msgid "Internal persistent device cache empty - not writing to %s" msgstr "" -#: filters/filter-persistent.c:176 +#: filters/filter-persistent.c:174 #, c-format msgid "Device cache incomplete - not writing to %s" msgstr "" -#: filters/filter-persistent.c:181 +#: filters/filter-persistent.c:179 #, c-format msgid "Dumping persistent device cache to %s" msgstr "" @@ -1850,12 +1755,12 @@ msgid "invalid filter pattern" msgstr "" -#: filters/filter-regex.c:172 +#: filters/filter-regex.c:174 #, c-format msgid "%s: New preferred name" msgstr "" -#: filters/filter-regex.c:188 +#: filters/filter-regex.c:190 #, c-format msgid "%s: Skipping (regex)" msgstr "" @@ -1895,54 +1800,54 @@ msgid "sysfs dev_set creation failed" msgstr "" -#: filters/filter.c:86 +#: filters/filter.c:85 #, c-format msgid "%s: Skipping: Unrecognised LVM device type %llu" msgstr "" -#: filters/filter.c:93 +#: filters/filter.c:92 #, c-format msgid "%s: Skipping: open failed" msgstr "" -#: filters/filter.c:99 +#: filters/filter.c:98 #, c-format msgid "%s: Skipping: dev_get_size failed" msgstr "" -#: filters/filter.c:104 +#: filters/filter.c:103 #, c-format msgid "%s: Skipping: Too small to hold a PV" msgstr "" -#: filters/filter.c:109 +#: filters/filter.c:108 #, c-format msgid "%s: Skipping: Partition table signature found" msgstr "" -#: filters/filter.c:136 +#: filters/filter.c:135 msgid "No proc filesystem found: using all block device types" msgstr "" -#: filters/filter.c:148 +#: filters/filter.c:147 msgid "Failed to create /proc/devices string" msgstr "" -#: filters/filter.c:203 +#: filters/filter.c:202 msgid "Expecting string in devices/types in config file" msgstr "" -#: filters/filter.c:211 +#: filters/filter.c:210 #, c-format msgid "Max partition count missing for %s in devices/types in config file" msgstr "" -#: filters/filter.c:217 +#: filters/filter.c:216 #, c-format msgid "Zero partition count invalid for %s in devices/types in config file" msgstr "" -#: filters/filter.c:245 +#: filters/filter.c:244 msgid "LVM type filter allocation failed" msgstr "" @@ -1996,12 +1901,12 @@ msgid "Found %s in %sVG %s" msgstr "" -#: format1/disk-rep.c:435 format_pool/disk_rep.c:69 +#: format1/disk-rep.c:435 format_pool/disk_rep.c:72 #, c-format msgid "Ignoring duplicate PV %s on %s" msgstr "" -#: format1/disk-rep.c:440 format_pool/disk_rep.c:74 +#: format1/disk-rep.c:440 format_pool/disk_rep.c:77 #, c-format msgid "Duplicate PV %s - using md %s" msgstr "" @@ -2010,218 +1915,220 @@ msgid "read_pvs_in_vg: dev_iter_create failed" msgstr "" -#: format1/disk-rep.c:526 +#: format1/disk-rep.c:527 #, c-format msgid "Too many uuids to fit on %s" msgstr "" -#: format1/disk-rep.c:559 +#: format1/disk-rep.c:561 #, c-format msgid "Couldn't zero lv area on device '%s'" msgstr "" -#: format1/disk-rep.c:567 +#: format1/disk-rep.c:571 #, c-format msgid "lv_number %d too large" msgstr "" -#: format1/disk-rep.c:600 +#: format1/disk-rep.c:604 msgid "Invalid PV structure size." msgstr "" -#: format1/disk-rep.c:609 +#: format1/disk-rep.c:613 msgid "Couldn't allocate temporary PV buffer." msgstr "" -#: format1/disk-rep.c:635 +#: format1/disk-rep.c:639 #, c-format msgid "Failed to write PV structure onto %s" msgstr "" -#: format1/disk-rep.c:654 +#: format1/disk-rep.c:658 #, c-format msgid "Failed to write VG data to %s" msgstr "" -#: format1/disk-rep.c:659 +#: format1/disk-rep.c:663 #, c-format msgid "Failed to write PV uuid list to %s" msgstr "" -#: format1/disk-rep.c:664 +#: format1/disk-rep.c:668 #, c-format msgid "Failed to write LV's to %s" msgstr "" -#: format1/disk-rep.c:669 +#: format1/disk-rep.c:673 #, c-format msgid "Failed to write extents to %s" msgstr "" -#: format1/disk-rep.c:709 +#: format1/disk-rep.c:715 #, c-format msgid "Successfully wrote data to %s" msgstr "" -#: format1/format1.c:75 +#: format1/format1.c:77 #, c-format msgid "VG data differs between PVs %s and %s" msgstr "" -#: format1/format1.c:77 format1/format1.c:92 +#: format1/format1.c:79 format1/format1.c:94 #, c-format msgid "VG data on %s: %s %s %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u" msgstr "" -#: format1/format1.c:118 +#: format1/format1.c:120 #, c-format msgid "%d PV(s) found for VG %s: expected %d" msgstr "" -#: format1/format1.c:301 format_pool/format_pool.c:230 +#: format1/format1.c:307 format_pool/format_pool.c:235 #, c-format msgid "Reading physical volume data %s from disk" msgstr "" -#: format1/format1.c:342 +#: format1/format1.c:348 #, c-format msgid "Physical volumes cannot be bigger than %s" msgstr "" -#: format1/format1.c:363 +#: format1/format1.c:369 msgid "Metadata would overwrite physical extents" msgstr "" -#: format1/format1.c:378 +#: format1/format1.c:384 #, c-format msgid "logical volumes cannot contain more than %d extents." msgstr "" -#: format1/format1.c:383 +#: format1/format1.c:389 #, c-format msgid "logical volumes cannot be larger than %s" msgstr "" -#: format1/format1.c:465 +#: format1/format1.c:471 #, c-format msgid "Extent size must be between %s and %s" msgstr "" -#: format1/format1.c:475 +#: format1/format1.c:481 #, c-format msgid "Extent size must be multiple of %s" msgstr "" -#: format1/format1.c:483 format_text/format-text.c:71 +#: format1/format1.c:489 format_text/format-text.c:71 msgid "Extent size must be power of 2" msgstr "" -#: format1/format1.c:579 +#: format1/format1.c:585 msgid "Couldn't create lvm1 label handler." msgstr "" -#: format1/format1.c:584 +#: format1/format1.c:590 msgid "Couldn't register lvm1 label handler." msgstr "" -#: format1/format1.c:588 format_pool/format_pool.c:355 -#: format_text/format-text.c:1706 +#: format1/format1.c:594 format_pool/format_pool.c:360 +#: format_text/format-text.c:1695 #, c-format msgid "Initialised format: %s" msgstr "" -#: format1/import-export.c:72 +#: format1/import-export.c:71 #, c-format msgid "System ID %s on %s differs from %s for volume group" msgstr "" -#: format1/import-export.c:108 +#: format1/import-export.c:101 msgid "Generated system_id too long" msgstr "" -#: format1/import-export.c:154 +#: format1/import-export.c:147 #, c-format msgid "Volume group name %s too long to export" msgstr "" -#: format1/import-export.c:392 +#: format1/import-export.c:386 #, c-format msgid "Segment type %s in LV %s: unsupported by format1" msgstr "" -#: format1/import-export.c:398 +#: format1/import-export.c:392 +#, c-format +msgid "LV stripe found in LV %s: unsupported by format1" +msgstr "" + +#: format1/import-export.c:562 #, c-format -msgid "Non-PV stripe found in LV %s: unsupported by format1" +msgid "Couldn't find snapshot origin '%s'." msgstr "" -#: format1/import-export.c:590 +#: format1/import-export.c:568 +#, c-format +msgid "Couldn't find snapshot cow store '%s'." +msgstr "" + +#: format1/import-export.c:610 msgid "Logical volume number out of bounds." msgstr "" -#: format1/import-export.c:597 +#: format1/import-export.c:617 #, c-format msgid "Couldn't find logical volume '%s'." msgstr "" -#: format1/import-export.c:617 +#: format1/import-export.c:639 #, c-format msgid "Couldn't find origin logical volume for snapshot '%s'." msgstr "" -#: format1/import-export.c:630 +#: format1/import-export.c:651 msgid "Couldn't add snapshot." msgstr "" -#: format1/import-extents.c:55 +#: format1/import-extents.c:56 msgid "Unable to create hash table for holding extent maps." msgstr "" -#: format1/import-extents.c:100 +#: format1/import-extents.c:101 #, c-format msgid "Physical volume (%s) contains an unknown logical volume (%s)." msgstr "" -#: format1/import-extents.c:145 +#: format1/import-extents.c:148 msgid "invalid lv in extent map" msgstr "" -#: format1/import-extents.c:152 +#: format1/import-extents.c:155 msgid "logical extent number out of bounds" msgstr "" -#: format1/import-extents.c:158 +#: format1/import-extents.c:161 #, c-format msgid "logical extent (%u) already mapped." msgstr "" -#: format1/import-extents.c:178 +#: format1/import-extents.c:181 #, c-format msgid "Logical volume (%s) contains an incomplete mapping table." msgstr "" -#: format1/import-extents.c:225 -msgid "Failed to allocate linear segment." -msgstr "" - #: format1/import-extents.c:273 #, c-format msgid "" "Number of stripes (%u) incompatible with logical extent count (%u) for %s" msgstr "" -#: format1/import-extents.c:301 -msgid "Failed to allocate striped segment." -msgstr "" - -#: format1/import-extents.c:359 +#: format1/import-extents.c:356 msgid "Couldn't allocate logical volume maps." msgstr "" -#: format1/import-extents.c:364 +#: format1/import-extents.c:361 msgid "Couldn't fill logical volume maps." msgstr "" -#: format1/import-extents.c:374 +#: format1/import-extents.c:371 msgid "Couldn't build extent segments." msgstr "" @@ -2255,112 +2162,112 @@ msgstr "" #: format1/lvm1-label.c:111 format_pool/pool_label.c:100 -#: format_text/text_label.c:276 +#: format_text/text_label.c:282 msgid "Couldn't allocate labeller object." msgstr "" -#: format_pool/disk_rep.c:96 format_pool/disk_rep.c:100 +#: format_pool/disk_rep.c:99 format_pool/disk_rep.c:103 #, c-format msgid "Calculated uuid %s for %s" msgstr "" -#: format_pool/disk_rep.c:276 +#: format_pool/disk_rep.c:281 #, c-format msgid "Unable to allocate %d 32-bit uints" msgstr "" -#: format_pool/disk_rep.c:343 +#: format_pool/disk_rep.c:349 #, c-format msgid "No devices for vg %s found in cache" msgstr "" -#: format_pool/disk_rep.c:365 +#: format_pool/disk_rep.c:371 msgid "Unable to allocate pool list structure" msgstr "" -#: format_pool/format_pool.c:47 +#: format_pool/format_pool.c:51 #, c-format msgid "Unable to allocate %d subpool structures" msgstr "" -#: format_pool/format_pool.c:67 +#: format_pool/format_pool.c:71 #, c-format msgid "Unable to allocate %d pool_device structures" msgstr "" -#: format_pool/format_pool.c:89 +#: format_pool/format_pool.c:93 #, c-format msgid "Missing subpool %d in pool %s" msgstr "" -#: format_pool/format_pool.c:94 +#: format_pool/format_pool.c:98 #, c-format msgid "Missing device %d for subpool %d in pool %s" msgstr "" -#: format_pool/format_pool.c:115 +#: format_pool/format_pool.c:119 msgid "Unable to allocate volume group structure" msgstr "" -#: format_pool/format_pool.c:280 +#: format_pool/format_pool.c:285 msgid "Unable to allocate format instance structure for pool format" msgstr "" -#: format_pool/format_pool.c:290 +#: format_pool/format_pool.c:295 msgid "Unable to allocate metadata area structure for pool format" msgstr "" -#: format_pool/format_pool.c:333 +#: format_pool/format_pool.c:338 msgid "Unable to allocate format type structure for pool format" msgstr "" -#: format_pool/format_pool.c:346 +#: format_pool/format_pool.c:351 msgid "Couldn't create pool label handler." msgstr "" -#: format_pool/format_pool.c:351 +#: format_pool/format_pool.c:356 msgid "Couldn't register pool label handler." msgstr "" -#: format_pool/import_export.c:65 +#: format_pool/import_export.c:68 msgid "Unable to allocate lv list structure" msgstr "" -#: format_pool/import_export.c:70 +#: format_pool/import_export.c:73 msgid "Unable to allocate logical volume structure" msgstr "" -#: format_pool/import_export.c:99 +#: format_pool/import_export.c:102 #, c-format msgid "Calculated lv uuid for lv %s: %s" msgstr "" -#: format_pool/import_export.c:134 +#: format_pool/import_export.c:138 msgid "Unable to allocate pv list structure" msgstr "" -#: format_pool/import_export.c:138 +#: format_pool/import_export.c:142 msgid "Unable to allocate pv structure" msgstr "" -#: format_pool/import_export.c:166 +#: format_pool/import_export.c:170 msgid "Unable to duplicate vg_name string" msgstr "" -#: format_pool/import_export.c:195 +#: format_pool/import_export.c:193 #, c-format msgid "Found sptype %X and converted it to %s" msgstr "" -#: format_pool/import_export.c:210 -msgid "Stripe size must be a power of 2" +#: format_pool/import_export.c:206 +msgid "Unable to allocate striped lv_segment structure" msgstr "" -#: format_pool/import_export.c:226 -msgid "Unable to allocate striped lv_segment structure" +#: format_pool/import_export.c:210 +msgid "Stripe size must be a power of 2" msgstr "" -#: format_pool/import_export.c:267 +#: format_pool/import_export.c:250 msgid "Unable to allocate linear lv_segment structure" msgstr "" @@ -2369,93 +2276,74 @@ msgid "The '%s' operation is not supported for the pool labeller." msgstr "" -#: format_text/archive.c:148 -#, c-format -msgid "Couldn't scan the archive directory (%s)." +#: format_text/archive.c:150 +msgid "Couldn't scan archive directory." msgstr "" -#: format_text/archive.c:175 +#: format_text/archive.c:177 msgid "Couldn't create new archive file." msgstr "" -#: format_text/archive.c:223 +#: format_text/archive.c:228 #, c-format msgid "Expiring archive %s" msgstr "" -#: format_text/archive.c:248 +#: format_text/archive.c:253 msgid "Couldn't create temporary archive name." msgstr "" -#: format_text/archive.c:253 +#: format_text/archive.c:258 msgid "Couldn't create FILE object for archive." msgstr "" -#: format_text/archive.c:284 +#: format_text/archive.c:275 format_text/archive.c:351 +#, c-format +msgid "Couldn't scan the archive directory (%s)." +msgstr "" + +#: format_text/archive.c:289 msgid "Archive file name too long." msgstr "" -#: format_text/archive.c:295 +#: format_text/archive.c:300 #, c-format msgid "Archive rename failed for %s" msgstr "" -#: format_text/archive.c:312 +#: format_text/archive.c:317 #, c-format msgid "File:\t\t%s" msgstr "" -#: format_text/archive.c:317 +#: format_text/archive.c:322 msgid "Couldn't create text instance object." msgstr "" -#: format_text/archive.c:327 +#: format_text/archive.c:332 msgid "Unable to read archive file." msgstr "" -#: format_text/archive.c:332 +#: format_text/archive.c:337 #, c-format msgid "VG name: \t%s" msgstr "" -#: format_text/archive.c:333 +#: format_text/archive.c:338 #, c-format msgid "Description:\t%s" msgstr "" -#: format_text/archive.c:334 +#: format_text/archive.c:339 #, c-format msgid "Backup Time:\t%s" msgstr "" -#: format_text/archive.c:351 +#: format_text/archive.c:356 #, c-format msgid "No archives found in %s." msgstr "" -#: format_text/archiver.c:43 format_text/archiver.c:155 -msgid "archive_params alloc failed" -msgstr "" - -#: format_text/archiver.c:128 -#, c-format -msgid "Archiving volume group \"%s\" metadata (seqno %u)." -msgstr "" - -#: format_text/archiver.c:303 -#, c-format -msgid "PV %s is a different format (seqno %s)" -msgstr "" - -#: format_text/archiver.c:364 -#, c-format -msgid "Creating volume group backup \"%s\" (seqno %u)." -msgstr "" - -#: format_text/archiver.c:402 -msgid "Failed to generate backup filename." -msgstr "" - #: format_text/export.c:69 #, c-format msgid "uname failed: %s" @@ -2465,23 +2353,19 @@ msgid "Internal error tracking indentation" msgstr "" -#: format_text/export.c:740 -msgid "text_export buffer allocation failed" -msgstr "" - -#: format_text/flags.c:76 +#: format_text/flags.c:73 msgid "Unknown flag set requested." msgstr "" -#: format_text/flags.c:122 +#: format_text/flags.c:119 msgid "Metadata inconsistency: Not all flags successfully exported." msgstr "" -#: format_text/flags.c:144 +#: format_text/flags.c:141 msgid "Status value is not a string." msgstr "" -#: format_text/flags.c:155 +#: format_text/flags.c:152 #, c-format msgid "Unknown status flag '%s'." msgstr "" @@ -2513,200 +2397,205 @@ msgid "Incorrect start sector in metadata area header: %llu" msgstr "" -#: format_text/format-text.c:285 -#, c-format -msgid "VG %s not found on %s" -msgstr "" - -#: format_text/format-text.c:293 format_text/format-text.c:390 +#: format_text/format-text.c:275 format_text/format-text.c:376 #, c-format msgid "VG %s metadata too large for circular buffer" msgstr "" -#: format_text/format-text.c:308 +#: format_text/format-text.c:290 #, c-format -msgid "Read %s %smetadata (%u) from %s at %llu size %llu" +msgid "Read %s metadata (%u) from %s at %llu size %llu" msgstr "" -#: format_text/format-text.c:375 +#: format_text/format-text.c:361 #, c-format msgid "VG %s metadata writing failed" msgstr "" -#: format_text/format-text.c:395 +#: format_text/format-text.c:381 #, c-format msgid "Writing %s metadata to %s at %llu len %llu" msgstr "" -#: format_text/format-text.c:407 +#: format_text/format-text.c:393 #, c-format msgid "Writing metadata to %s at %llu len %u" msgstr "" -#: format_text/format-text.c:481 +#: format_text/format-text.c:460 #, c-format -msgid "%sCommitting %s metadata (%u) to %s header at %llu" +msgid "Committing %s metadata (%u) to %s header at %llu" msgstr "" -#: format_text/format-text.c:486 format_text/format-text.c:566 +#: format_text/format-text.c:465 format_text/format-text.c:534 msgid "Failed to write metadata area header" msgstr "" -#: format_text/format-text.c:599 +#: format_text/format-text.c:567 #, c-format msgid "'%s' does not contain volume group '%s'." msgstr "" -#: format_text/format-text.c:603 +#: format_text/format-text.c:571 #, c-format msgid "Read volume group %s from %s" msgstr "" -#: format_text/format-text.c:646 +#: format_text/format-text.c:605 msgid "Text format failed to determine directory." msgstr "" -#: format_text/format-text.c:651 +#: format_text/format-text.c:610 msgid "Couldn't create temporary text file name." msgstr "" -#: format_text/format-text.c:661 +#: format_text/format-text.c:620 #, c-format msgid "Writing %s metadata to %s" msgstr "" -#: format_text/format-text.c:664 +#: format_text/format-text.c:623 #, c-format msgid "Failed to write metadata to %s." msgstr "" -#: format_text/format-text.c:682 format_text/format-text.c:708 -#: format_text/format-text.c:745 misc/lvm-file.c:90 +#: format_text/format-text.c:641 format_text/format-text.c:667 +#: format_text/format-text.c:704 #, c-format msgid "%s: rename to %s failed: %s" msgstr "" -#: format_text/format-text.c:697 +#: format_text/format-text.c:656 #, c-format msgid "Test mode: Skipping committing %s metadata (%u)" msgstr "" -#: format_text/format-text.c:700 +#: format_text/format-text.c:659 #, c-format msgid "Unlinking %s" msgstr "" -#: format_text/format-text.c:705 +#: format_text/format-text.c:664 #, c-format msgid "Committing %s metadata (%u)" msgstr "" -#: format_text/format-text.c:742 +#: format_text/format-text.c:701 msgid "Test mode: Skipping rename" msgstr "" -#: format_text/format-text.c:805 format_text/format-text.c:1438 +#: format_text/format-text.c:765 format_text/format-text.c:1425 #, c-format msgid "Name too long %s/%s" msgstr "" -#: format_text/format-text.c:933 +#: format_text/format-text.c:894 #, c-format msgid "Physical extents end beyond end of device %s!" msgstr "" -#: format_text/format-text.c:960 +#: format_text/format-text.c:910 #, c-format -msgid "Warning: metadata area fills disk leaving no space for data on %s." +msgid "Warning: metadata area fills disk %s" msgstr "" -#: format_text/format-text.c:990 format_text/format-text.c:1036 +#: format_text/format-text.c:940 format_text/format-text.c:986 msgid "Failed to wipe new metadata area" msgstr "" -#: format_text/format-text.c:1083 +#: format_text/format-text.c:1035 #, c-format msgid "Creating metadata area on %s at sector %llu size %llu sectors" msgstr "" -#: format_text/format-text.c:1164 +#: format_text/format-text.c:1114 +#, c-format +msgid "format_text: _vg_read failed to read VG %s" +msgstr "" + +#: format_text/format-text.c:1120 +#, c-format +msgid "Warning: Volume group %s is not consistent" +msgstr "" + +#: format_text/format-text.c:1147 msgid "_add_raw allocation failed" msgstr "" -#: format_text/format-text.c:1223 +#: format_text/format-text.c:1207 #, c-format msgid "Must be exactly one data area (found %d) on PV %s" msgstr "" -#: format_text/format-text.c:1238 format_text/format-text.c:1242 +#: format_text/format-text.c:1224 format_text/format-text.c:1228 msgid "metadata_area allocation failed" msgstr "" -#: format_text/format-text.c:1416 +#: format_text/format-text.c:1402 msgid "Couldn't allocate format instance object." msgstr "" -#: format_text/format-text.c:1523 +#: format_text/format-text.c:1513 #, c-format msgid "%s: Volume group filename may not end in .tmp" msgstr "" -#: format_text/format-text.c:1557 +#: format_text/format-text.c:1547 msgid "Couldn't allocate text format context object." msgstr "" -#: format_text/format-text.c:1579 +#: format_text/format-text.c:1569 msgid "_add_dir allocation failed" msgstr "" -#: format_text/format-text.c:1582 +#: format_text/format-text.c:1572 #, c-format msgid "Adding text format metadata dir: %s" msgstr "" -#: format_text/format-text.c:1599 +#: format_text/format-text.c:1589 msgid "Empty metadata disk_area section of config file" msgstr "" -#: format_text/format-text.c:1604 +#: format_text/format-text.c:1594 msgid "Missing start_sector in metadata disk_area section of config file" msgstr "" -#: format_text/format-text.c:1611 +#: format_text/format-text.c:1601 msgid "Missing size in metadata disk_area section of config file" msgstr "" -#: format_text/format-text.c:1618 +#: format_text/format-text.c:1608 msgid "Missing uuid in metadata disk_area section of config file" msgstr "" -#: format_text/format-text.c:1624 +#: format_text/format-text.c:1614 #, c-format msgid "Invalid uuid in metadata disk_area section of config file: %s" msgstr "" -#: format_text/format-text.c:1633 format_text/import_vsn1.c:156 +#: format_text/format-text.c:1623 format_text/import_vsn1.c:155 msgid "Couldn't find device." msgstr "" -#: format_text/format-text.c:1635 format_text/import_vsn1.c:158 +#: format_text/format-text.c:1625 format_text/import_vsn1.c:157 #, c-format msgid "Couldn't find device with uuid '%s'." msgstr "" -#: format_text/format-text.c:1663 +#: format_text/format-text.c:1652 msgid "Failed to allocate dir_list" msgstr "" -#: format_text/format-text.c:1674 +#: format_text/format-text.c:1663 msgid "Couldn't create text label handler." msgstr "" -#: format_text/format-text.c:1679 +#: format_text/format-text.c:1668 msgid "Couldn't register text label handler." msgstr "" -#: format_text/format-text.c:1686 +#: format_text/format-text.c:1675 msgid "Invalid string in config file: metadata/dirs" msgstr "" @@ -2714,143 +2603,143 @@ msgid "Couldn't read volume group metadata." msgstr "" -#: format_text/import_vsn1.c:48 +#: format_text/import_vsn1.c:47 #, c-format msgid "Can't process text format file - %s." msgstr "" -#: format_text/import_vsn1.c:96 +#: format_text/import_vsn1.c:95 msgid "Couldn't find uuid." msgstr "" -#: format_text/import_vsn1.c:102 +#: format_text/import_vsn1.c:101 msgid "uuid must be a string." msgstr "" -#: format_text/import_vsn1.c:107 +#: format_text/import_vsn1.c:106 msgid "Invalid uuid." msgstr "" -#: format_text/import_vsn1.c:140 +#: format_text/import_vsn1.c:139 msgid "Empty pv section." msgstr "" -#: format_text/import_vsn1.c:145 +#: format_text/import_vsn1.c:144 msgid "Couldn't read uuid for volume group." msgstr "" -#: format_text/import_vsn1.c:173 +#: format_text/import_vsn1.c:172 msgid "Couldn't find status flags for physical volume." msgstr "" -#: format_text/import_vsn1.c:178 +#: format_text/import_vsn1.c:177 msgid "Couldn't read status flags for physical volume." msgstr "" -#: format_text/import_vsn1.c:183 +#: format_text/import_vsn1.c:182 msgid "Couldn't read extent size for volume group." msgstr "" -#: format_text/import_vsn1.c:188 +#: format_text/import_vsn1.c:187 msgid "Couldn't find extent count (pe_count) for physical volume." msgstr "" -#: format_text/import_vsn1.c:199 +#: format_text/import_vsn1.c:197 #, c-format msgid "Couldn't read tags for physical volume %s in %s." msgstr "" -#: format_text/import_vsn1.c:252 +#: format_text/import_vsn1.c:248 msgid "Empty segment section." msgstr "" -#: format_text/import_vsn1.c:257 +#: format_text/import_vsn1.c:253 #, c-format msgid "Couldn't read 'start_extent' for segment '%s'." msgstr "" -#: format_text/import_vsn1.c:263 +#: format_text/import_vsn1.c:259 #, c-format msgid "Couldn't read 'extent_count' for segment '%s'." msgstr "" -#: format_text/import_vsn1.c:273 +#: format_text/import_vsn1.c:269 msgid "Segment type must be a string." msgstr "" -#: format_text/import_vsn1.c:293 +#: format_text/import_vsn1.c:287 msgid "Segment allocation failed" msgstr "" -#: format_text/import_vsn1.c:306 +#: format_text/import_vsn1.c:308 #, c-format msgid "Couldn't read tags for a segment of %s/%s." msgstr "" -#: format_text/import_vsn1.c:335 +#: format_text/import_vsn1.c:336 #, c-format msgid "Zero areas not allowed for segment '%s'" msgstr "" -#: format_text/import_vsn1.c:371 +#: format_text/import_vsn1.c:378 #, c-format msgid "Couldn't find volume '%s' for segment '%s'." msgstr "" -#: format_text/import_vsn1.c:384 +#: format_text/import_vsn1.c:391 #, c-format msgid "Incorrect number of areas in area array for segment '%s'." msgstr "" -#: format_text/import_vsn1.c:414 +#: format_text/import_vsn1.c:421 msgid "Only one segment permitted for snapshot" msgstr "" -#: format_text/import_vsn1.c:420 +#: format_text/import_vsn1.c:427 msgid "Couldn't read segment count for logical volume." msgstr "" -#: format_text/import_vsn1.c:425 +#: format_text/import_vsn1.c:432 msgid "segment_count and actual number of segments disagree." msgstr "" -#: format_text/import_vsn1.c:471 format_text/import_vsn1.c:539 +#: format_text/import_vsn1.c:478 format_text/import_vsn1.c:544 msgid "Empty logical volume section." msgstr "" -#: format_text/import_vsn1.c:476 +#: format_text/import_vsn1.c:483 msgid "Couldn't find status flags for logical volume." msgstr "" -#: format_text/import_vsn1.c:481 +#: format_text/import_vsn1.c:488 msgid "Couldn't read status flags for logical volume." msgstr "" -#: format_text/import_vsn1.c:489 format_text/import_vsn1.c:710 +#: format_text/import_vsn1.c:496 format_text/import_vsn1.c:710 msgid "allocation_policy must be a string." msgstr "" -#: format_text/import_vsn1.c:512 +#: format_text/import_vsn1.c:517 #, c-format msgid "Couldn't read tags for logical volume %s/%s." msgstr "" -#: format_text/import_vsn1.c:532 +#: format_text/import_vsn1.c:537 #, c-format msgid "Lost logical volume reference %s" msgstr "" -#: format_text/import_vsn1.c:545 +#: format_text/import_vsn1.c:550 #, c-format msgid "Couldn't read uuid for logical volume %s." msgstr "" -#: format_text/import_vsn1.c:572 +#: format_text/import_vsn1.c:569 #, c-format msgid "Couldn't read minor number for logical volume %s." msgstr "" -#: format_text/import_vsn1.c:580 +#: format_text/import_vsn1.c:576 #, c-format msgid "Couldn't read major number for logical volume %s." msgstr "" @@ -2912,17 +2801,17 @@ msgid "Couldn't find all physical volumes for volume group %s." msgstr "" -#: format_text/import_vsn1.c:744 +#: format_text/import_vsn1.c:745 #, c-format msgid "Couldn't read tags for volume group %s." msgstr "" -#: format_text/import_vsn1.c:750 +#: format_text/import_vsn1.c:751 #, c-format msgid "Couldn't read all logical volume names for volume group %s." msgstr "" -#: format_text/import_vsn1.c:757 +#: format_text/import_vsn1.c:758 #, c-format msgid "Couldn't read all logical volumes for volume group %s." msgstr "" @@ -2931,15 +2820,15 @@ msgid "Found a tag that is not a string" msgstr "" -#: format_text/text_label.c:96 format_text/text_label.c:101 +#: format_text/text_label.c:100 format_text/text_label.c:105 msgid "struct data_area_list allocation failed" msgstr "" -#: format_text/text_label.c:136 format_text/text_label.c:147 +#: format_text/text_label.c:140 format_text/text_label.c:151 msgid "struct mda_list allocation failed" msgstr "" -#: format_text/text_label.c:141 format_text/text_label.c:152 +#: format_text/text_label.c:145 format_text/text_label.c:156 msgid "struct mda_context allocation failed" msgstr "" @@ -2947,22 +2836,22 @@ msgid "Couldn't allocate memory for labeller list object." msgstr "" -#: label/label.c:131 label/label.c:225 +#: label/label.c:130 label/label.c:223 #, c-format msgid "%s: Failed to read label area" msgstr "" -#: label/label.c:143 label/label.c:170 +#: label/label.c:142 label/label.c:170 #, c-format msgid "Ignoring additional label on %s at sector %llu" msgstr "" -#: label/label.c:148 +#: label/label.c:147 #, c-format msgid "%s: Label for sector %llu found at sector %llu - ignoring" msgstr "" -#: label/label.c:157 +#: label/label.c:156 #, c-format msgid "Label checksum incorrect on %s - ignoring" msgstr "" @@ -2972,46 +2861,46 @@ msgid "%s: %s label detected" msgstr "" -#: label/label.c:189 +#: label/label.c:186 #, c-format msgid "%s: No label detected" msgstr "" -#: label/label.c:211 +#: label/label.c:209 #, c-format msgid "Scanning for labels to wipe from %s" msgstr "" -#: label/label.c:251 +#: label/label.c:250 #, c-format msgid "%s: Wiping label at sector %llu" msgstr "" -#: label/label.c:255 +#: label/label.c:254 #, c-format msgid "Failed to remove label from %s at sector %llu" msgstr "" -#: label/label.c:297 +#: label/label.c:296 msgid "Label handler does not support label writes" msgstr "" -#: label/label.c:302 +#: label/label.c:301 #, c-format msgid "Label sector %llu beyond range (%ld)" msgstr "" -#: label/label.c:326 +#: label/label.c:325 #, c-format msgid "%s: Writing label to sector %llu" msgstr "" -#: label/label.c:329 +#: label/label.c:328 #, c-format msgid "Failed to write label to %s" msgstr "" -#: label/label.c:364 +#: label/label.c:363 msgid "label allocaction failed" msgstr "" @@ -3054,8 +2943,8 @@ msgid "Error locking on node %s: %s" msgstr "" -#: locking/cluster_locking.c:406 locking/file_locking.c:264 -#: locking/locking.c:247 locking/no_locking.c:71 +#: locking/cluster_locking.c:406 locking/file_locking.c:260 +#: locking/locking.c:244 locking/no_locking.c:71 #, c-format msgid "Unrecognised lock scope: %d" msgstr "" @@ -3088,94 +2977,90 @@ msgid "CTRL-c detected: giving up waiting for lock" msgstr "" -#: locking/file_locking.c:149 +#: locking/file_locking.c:147 #, c-format msgid "Unrecognised lock type: %d" msgstr "" -#: locking/file_locking.c:163 +#: locking/file_locking.c:161 #, c-format msgid "Locking %s %c%c" msgstr "" -#: locking/file_locking.c:235 +#: locking/file_locking.c:231 #, c-format msgid "Unlocking LV %s" msgstr "" -#: locking/file_locking.c:240 +#: locking/file_locking.c:236 #, c-format msgid "Locking LV %s (NL)" msgstr "" -#: locking/file_locking.c:245 +#: locking/file_locking.c:241 #, c-format msgid "Locking LV %s (R)" msgstr "" -#: locking/file_locking.c:250 +#: locking/file_locking.c:246 #, c-format msgid "Locking LV %s (W)" msgstr "" -#: locking/file_locking.c:255 +#: locking/file_locking.c:251 #, c-format msgid "Locking LV %s (EX)" msgstr "" -#: locking/locking.c:132 +#: locking/locking.c:130 msgid "" "WARNING: Locking disabled. Be careful! This could corrupt your metadata." msgstr "" -#: locking/locking.c:139 +#: locking/locking.c:137 msgid "File-based locking enabled." msgstr "" -#: locking/locking.c:146 +#: locking/locking.c:144 msgid "External locking enabled." msgstr "" -#: locking/locking.c:154 +#: locking/locking.c:152 msgid "Cluster locking enabled." msgstr "" -#: locking/locking.c:159 +#: locking/locking.c:157 msgid "Unknown locking type requested." msgstr "" -#: locking/locking.c:167 +#: locking/locking.c:165 msgid "Locking disabled - only read operations permitted." msgstr "" -#: locking/locking.c:194 +#: locking/locking.c:191 #, c-format msgid "LVM1 proc VG pathname too long for %s" msgstr "" -#: locking/locking.c:199 +#: locking/locking.c:196 #, c-format msgid "%s exists: Is the original LVM driver using this volume group?" msgstr "" -#: locking/locking.c:284 lvresize.c:526 +#: locking/locking.c:285 lvresize.c:469 #, c-format msgid "Failed to suspend %s" msgstr "" -#: locking/locking.c:305 +#: locking/locking.c:307 #, c-format msgid "Failed to activate %s" msgstr "" -#: log/log.c:135 +#: log/log.c:133 msgid "Test mode: Metadata will NOT be updated." msgstr "" -#: log/log.c:264 -msgid "vsnprintf failed: skipping external logging function" -msgstr "" - #: lvchange.c:26 #, c-format msgid "Logical volume \"%s\" is already writable" @@ -3196,23 +3081,22 @@ msgid "Setting logical volume \"%s\" read-only" msgstr "" -#: lvchange.c:47 lvchange.c:168 lvchange.c:211 lvchange.c:296 lvchange.c:354 -#: lvconvert.c:87 +#: lvchange.c:47 lvchange.c:162 lvchange.c:205 lvchange.c:290 lvchange.c:348 #, c-format msgid "Updating logical volume \"%s\" on disk(s)" msgstr "" -#: lvchange.c:56 lvchange.c:220 lvchange.c:305 lvconvert.c:97 +#: lvchange.c:56 lvchange.c:214 lvchange.c:299 #, c-format msgid "Failed to lock %s" msgstr "" -#: lvchange.c:66 lvchange.c:230 lvchange.c:315 +#: lvchange.c:66 lvchange.c:224 lvchange.c:309 #, c-format msgid "Updating permissions for \"%s\" in kernel" msgstr "" -#: lvchange.c:68 lvchange.c:232 lvchange.c:317 lvconvert.c:110 lvresize.c:538 +#: lvchange.c:68 lvchange.c:226 lvchange.c:311 lvresize.c:481 #, c-format msgid "Problem reactivating %s" msgstr "" @@ -3229,313 +3113,203 @@ #: lvchange.c:98 #, c-format -msgid "Locking failed: ignoring clustered logical volume %s" -msgstr "" - -#: lvchange.c:104 -#, c-format msgid "Activating logical volume \"%s\" exclusively" msgstr "" -#: lvchange.c:111 +#: lvchange.c:105 #, c-format msgid "Activating logical volume \"%s\" locally" msgstr "" -#: lvchange.c:118 +#: lvchange.c:112 #, c-format msgid "Activating logical volume \"%s\"" msgstr "" -#: lvchange.c:128 +#: lvchange.c:122 #, c-format msgid "Spawning background pvmove process for %s" msgstr "" -#: lvchange.c:139 +#: lvchange.c:133 #, c-format msgid "Refreshing logical volume \"%s\" (if active)" msgstr "" -#: lvchange.c:156 +#: lvchange.c:150 #, c-format msgid "Allocation policy of logical volume \"%s\" is already %s" msgstr "" -#: lvchange.c:165 +#: lvchange.c:159 #, c-format msgid "Setting contiguous allocation policy for \"%s\" to %s" msgstr "" -#: lvchange.c:201 +#: lvchange.c:195 #, c-format msgid "Read ahead is already %u for \"%s\"" msgstr "" -#: lvchange.c:208 +#: lvchange.c:202 #, c-format msgid "Setting read ahead to %u for \"%s\"" msgstr "" -#: lvchange.c:247 +#: lvchange.c:241 #, c-format msgid "Minor number is already not persistent for \"%s\"" msgstr "" -#: lvchange.c:254 +#: lvchange.c:248 #, c-format msgid "Disabling persistent device number for \"%s\"" msgstr "" -#: lvchange.c:258 +#: lvchange.c:252 msgid "Minor number must be specified with -My" msgstr "" -#: lvchange.c:262 +#: lvchange.c:256 msgid "Major number must be specified with -My" msgstr "" -#: lvchange.c:270 +#: lvchange.c:264 #, c-format msgid "%s device number not changed." msgstr "" -#: lvchange.c:276 +#: lvchange.c:270 #, c-format msgid "Ensuring %s is inactive." msgstr "" -#: lvchange.c:278 +#: lvchange.c:272 #, c-format msgid "%s: deactivation failed" msgstr "" -#: lvchange.c:284 +#: lvchange.c:278 #, c-format msgid "Setting persistent device number to (%d, %d) for \"%s\"" msgstr "" -#: lvchange.c:287 +#: lvchange.c:281 #, c-format msgid "Re-activating logical volume \"%s\"" msgstr "" -#: lvchange.c:290 +#: lvchange.c:284 #, c-format msgid "%s: reactivation failed" msgstr "" -#: lvchange.c:330 lvcreate.c:682 pvchange.c:49 vgchange.c:322 vgcreate.c:111 +#: lvchange.c:324 lvcreate.c:542 pvchange.c:46 vgchange.c:219 vgcreate.c:117 msgid "Failed to get tag" msgstr "" -#: lvchange.c:335 +#: lvchange.c:329 #, c-format msgid "Logical volume %s/%s does not support tags" msgstr "" -#: lvchange.c:342 lvcreate.c:693 +#: lvchange.c:336 lvcreate.c:553 #, c-format msgid "Failed to add tag %s to %s/%s" msgstr "" -#: lvchange.c:348 +#: lvchange.c:342 #, c-format msgid "Failed to remove tag %s from %s/%s" msgstr "" -#: lvchange.c:381 +#: lvchange.c:374 #, c-format msgid "Only -a permitted with read-only volume group \"%s\"" msgstr "" -#: lvchange.c:390 +#: lvchange.c:383 #, c-format msgid "Can't change logical volume \"%s\" under snapshot" msgstr "" -#: lvchange.c:396 +#: lvchange.c:389 #, c-format msgid "Can't change snapshot logical volume \"%s\"" msgstr "" -#: lvchange.c:402 +#: lvchange.c:395 #, c-format msgid "Unable to change pvmove LV %s" msgstr "" -#: lvchange.c:404 +#: lvchange.c:397 msgid "Use 'pvmove --abort' to abandon a pvmove" msgstr "" -#: lvchange.c:409 -#, c-format -msgid "Unable to change mirror log LV %s directly" -msgstr "" - -#: lvchange.c:414 -#, c-format -msgid "Unable to change mirror image LV %s directly" -msgstr "" - -#: lvchange.c:420 -#, c-format -msgid "Unable to change internal LV %s directly" -msgstr "" - -#: lvchange.c:474 +#: lvchange.c:450 #, c-format msgid "Logical volume \"%s\" changed" msgstr "" -#: lvchange.c:496 +#: lvchange.c:472 msgid "" "One or more of -a, -C, -j, -m, -M, -p, -r, --refresh, --alloc, --addtag or --" "deltag required" msgstr "" -#: lvchange.c:506 +#: lvchange.c:482 msgid "Only -a permitted with --ignorelockingfailure" msgstr "" -#: lvchange.c:511 lvconvert.c:172 +#: lvchange.c:487 msgid "Please give logical volume path(s)" msgstr "" -#: lvchange.c:517 +#: lvchange.c:493 msgid "--major and --minor require -My" msgstr "" -#: lvchange.c:522 +#: lvchange.c:498 msgid "Only give one logical volume when specifying minor" msgstr "" -#: lvchange.c:527 +#: lvchange.c:503 msgid "Only one of --alloc and --contiguous permitted" msgstr "" -#: lvconvert.c:37 -#, c-format -msgid "Logical volume %s is already not mirrored." -msgstr "" - -#: lvconvert.c:49 -#, c-format -msgid "Logical volume %s has multiple mirror segments." -msgstr "" - -#: lvconvert.c:57 -#, c-format -msgid "Logical volume %s already has %u mirror(s)." -msgstr "" - -#: lvconvert.c:68 lvconvert.c:82 -msgid "Adding mirror images is not supported yet." -msgstr "" - -#: lvconvert.c:107 -#, c-format -msgid "Updating \"%s\" in kernel" -msgstr "" - -#: lvconvert.c:114 -#, c-format -msgid "Logical volume %s converted." -msgstr "" - -#: lvconvert.c:125 -#, c-format -msgid "Cannot convert locked LV %s" -msgstr "" - -#: lvconvert.c:130 -#, c-format -msgid "Can't convert logical volume \"%s\" under snapshot" -msgstr "" - -#: lvconvert.c:136 -#, c-format -msgid "Can't convert snapshot logical volume \"%s\"" -msgstr "" - -#: lvconvert.c:142 -#, c-format -msgid "Unable to convert pvmove LV %s" -msgstr "" - -#: lvconvert.c:167 -msgid "--mirrors argument required" -msgstr "" - -#: lvconvert.c:182 lvrename.c:54 -msgid "Please provide a valid volume group name" -msgstr "" - -#: lvconvert.c:189 lvrename.c:102 vgrename.c:65 -#, c-format -msgid "Checking for existing volume group \"%s\"" -msgstr "" - -#: lvconvert.c:192 lvcreate.c:809 lvrename.c:105 lvresize.c:566 pvchange.c:59 -#: pvmove.c:61 vgcreate.c:144 vgextend.c:47 vgmerge.c:33 vgmerge.c:57 -#: vgreduce.c:265 vgrename.c:68 vgrename.c:102 vgsplit.c:189 vgsplit.c:213 -#, c-format -msgid "Can't get lock for %s" -msgstr "" - -#: lvconvert.c:197 lvcreate.c:438 lvrename.c:110 pvmove.c:66 vgdisplay.c:24 -#: vgmerge.c:38 vgmerge.c:64 vgreduce.c:271 vgrename.c:73 vgsplit.c:194 -#, c-format -msgid "Volume group \"%s\" doesn't exist" -msgstr "" - -#: lvconvert.c:202 lvcreate.c:443 lvrename.c:115 metadata/metadata.c:1166 -#: polldaemon.c:200 pvchange.c:72 pvmove.c:72 toollib.c:42 vgchange.c:415 -#: vgck.c:32 vgconvert.c:54 vgextend.c:57 vgmerge.c:44 vgmerge.c:69 -#: vgreduce.c:321 vgremove.c:35 vgrename.c:80 vgsplit.c:200 -#, c-format -msgid "Volume group \"%s\" is exported" -msgstr "" - -#: lvconvert.c:207 lvcreate.c:448 lvremove.c:27 lvrename.c:120 pvchange.c:78 -#: pvmove.c:78 vgchange.c:410 vgconvert.c:49 vgexport.c:38 vgextend.c:62 -#: vgmerge.c:50 vgmerge.c:74 vgreduce.c:327 vgrename.c:86 vgsplit.c:206 -#, c-format -msgid "Volume group \"%s\" is read-only" -msgstr "" - -#: lvconvert.c:212 -#, c-format -msgid "Logical volume \"%s\" not found in volume group \"%s\"" -msgstr "" - -#: lvcreate.c:65 +#: lvcreate.c:63 msgid "Please specify a logical volume to act as the snapshot origin." msgstr "" -#: lvcreate.c:73 +#: lvcreate.c:71 msgid "The origin name should include the volume group." msgstr "" -#: lvcreate.c:89 lvresize.c:102 +#: lvcreate.c:87 lvresize.c:101 msgid "Please provide a volume group name" msgstr "" -#: lvcreate.c:108 +#: lvcreate.c:106 msgid "Volume group name expected (no slash)" msgstr "" -#: lvcreate.c:123 +#: lvcreate.c:121 #, c-format msgid "Inconsistent volume group names given: \"%s\" and \"%s\"" msgstr "" +#: lvcreate.c:140 lvrename.c:88 +msgid "" +"Names starting \"snapshot\" are reserved. Please choose a different LV name." +msgstr "" + #: lvcreate.c:146 #, c-format msgid "Logical volume name \"%s\" is invalid" msgstr "" -#: lvcreate.c:159 lvresize.c:64 +#: lvcreate.c:159 lvresize.c:63 msgid "Please specify either size or extents (not both)" msgstr "" @@ -3555,7 +3329,7 @@ msgid "Ignoring stripesize argument with single stripe" msgstr "" -#: lvcreate.c:206 lvresize.c:287 +#: lvcreate.c:206 lvresize.c:279 #, c-format msgid "Using default stripesize %dKB" msgstr "" @@ -3575,227 +3349,215 @@ msgid "Invalid stripe size %d" msgstr "" -#: lvcreate.c:238 -#, c-format -msgid "Too few physical volumes on command line for %d-way mirroring" -msgstr "" - -#: lvcreate.c:245 -msgid "Negative regionsize is invalid" -msgstr "" - -#: lvcreate.c:255 -#, c-format -msgid "Region size (%u) must be a power of 2" -msgstr "" - -#: lvcreate.c:279 +#: lvcreate.c:247 msgid "Redundant stripes argument: default is 1" msgstr "" -#: lvcreate.c:293 -msgid "Redundant mirrors argument: default is 0" -msgstr "" - -#: lvcreate.c:298 +#: lvcreate.c:254 msgid "-Z is incompatible with snapshots" msgstr "" -#: lvcreate.c:302 +#: lvcreate.c:258 msgid "Negative chunk size is invalid" msgstr "" -#: lvcreate.c:306 +#: lvcreate.c:262 #, c-format msgid "Setting chunksize to %d sectors." msgstr "" -#: lvcreate.c:314 +#: lvcreate.c:270 msgid "-c is only available with snapshots" msgstr "" -#: lvcreate.c:321 -msgid "mirrors and snapshots are currently incompatible" +#: lvcreate.c:277 metadata/mirror.c:54 +#, c-format +msgid "%s: Required device-mapper target(s) not detected in your kernel" msgstr "" -#: lvcreate.c:327 -msgid "mirrors and stripes are currently incompatible" -msgstr "" - -#: lvcreate.c:340 metadata/mirror.c:192 -#, c-format -msgid "%s: Required device-mapper target(s) not detected in your kernel" -msgstr "" - -#: lvcreate.c:368 +#: lvcreate.c:302 msgid "Conflicting contiguous and alloc arguments" msgstr "" -#: lvcreate.c:393 +#: lvcreate.c:327 msgid "Please specify minor number with --minor when using -My" msgstr "" -#: lvcreate.c:398 +#: lvcreate.c:332 msgid "Please specify major number with --major when using -My" msgstr "" -#: lvcreate.c:404 +#: lvcreate.c:338 msgid "--major and --minor incompatible with -Mn" msgstr "" -#: lvcreate.c:435 pvmove.c:300 toollib.c:350 vgreduce.c:263 -#, c-format -msgid "Finding volume group \"%s\"" +#: lvcreate.c:367 +msgid "Name allocation failed - device not zeroed" msgstr "" -#: lvcreate.c:453 lvrename.c:125 +#: lvcreate.c:373 #, c-format -msgid "Logical volume \"%s\" already exists in volume group \"%s\"" -msgstr "" - -#: lvcreate.c:459 -msgid "Metadata does not support mirroring." +msgid "Name too long - device not zeroed (%s)" msgstr "" -#: lvcreate.c:476 +#: lvcreate.c:377 #, c-format -msgid "Setting stripe size %d KB to physical extent size %u KB" +msgid "Zeroing start of logical volume \"%s\"" msgstr "" -#: lvcreate.c:489 lvresize.c:206 +#: lvcreate.c:380 #, c-format -msgid "Rounding up size to full physical extent %s" +msgid "%s: not found: device not zeroed" msgstr "" -#: lvcreate.c:497 +#: lvcreate.c:407 pvmove.c:291 toollib.c:325 vgreduce.c:258 #, c-format -msgid "Rounding size (%d extents) up to stripe boundary size (%d extents)" +msgid "Finding volume group \"%s\"" msgstr "" -#: lvcreate.c:505 -msgid "Can't create snapshot without using device-mapper kernel driver" +#: lvcreate.c:410 lvrename.c:112 pvmove.c:66 vgdisplay.c:24 vgmerge.c:38 +#: vgmerge.c:64 vgreduce.c:266 vgrename.c:73 vgsplit.c:178 +#, c-format +msgid "Volume group \"%s\" doesn't exist" msgstr "" -#: lvcreate.c:510 +#: lvcreate.c:415 lvrename.c:117 metadata/metadata.c:812 polldaemon.c:192 +#: pvchange.c:69 pvmove.c:72 toollib.c:42 vgchange.c:312 vgck.c:32 +#: vgconvert.c:54 vgextend.c:57 vgmerge.c:44 vgmerge.c:69 vgreduce.c:316 +#: vgremove.c:35 vgrename.c:80 vgsplit.c:184 #, c-format -msgid "Couldn't find origin volume '%s'." +msgid "Volume group \"%s\" is exported" msgstr "" -#: lvcreate.c:515 -msgid "Snapshots of snapshots are not supported yet." +#: lvcreate.c:420 lvremove.c:27 lvrename.c:122 pvchange.c:75 pvmove.c:78 +#: vgchange.c:307 vgconvert.c:49 vgexport.c:38 vgextend.c:62 vgmerge.c:50 +#: vgmerge.c:74 vgreduce.c:322 vgrename.c:86 vgsplit.c:190 +#, c-format +msgid "Volume group \"%s\" is read-only" msgstr "" -#: lvcreate.c:520 -msgid "Snapshots of locked devices are not supported yet" +#: lvcreate.c:425 lvrename.c:127 +#, c-format +msgid "Logical volume \"%s\" already exists in volume group \"%s\"" msgstr "" -#: lvcreate.c:529 +#: lvcreate.c:443 #, c-format -msgid "Unable to create logical volume %s with no extents" +msgid "Setting stripe size %d KB to physical extent size %u KB" msgstr "" -#: lvcreate.c:536 +#: lvcreate.c:456 lvresize.c:198 #, c-format -msgid "Insufficient free extents (%u) in volume group %s: %u required" +msgid "Rounding up size to full physical extent %s" msgstr "" -#: lvcreate.c:542 +#: lvcreate.c:464 #, c-format -msgid "Number of stripes (%u) must not exceed number of physical volumes (%d)" +msgid "Rounding size (%d extents) up to stripe boundary size (%d extents)" msgstr "" -#: lvcreate.c:549 -msgid "Can't create mirror without using device-mapper kernel driver." +#: lvcreate.c:472 +msgid "Can't create snapshot without using device-mapper kernel driver" msgstr "" -#: lvcreate.c:568 -msgid "Failed to generate LV name." +#: lvcreate.c:477 +#, c-format +msgid "Couldn't find origin volume '%s'." msgstr "" -#: lvcreate.c:580 mirror/mirrored.c:218 -#, c-format -msgid "Using reduced mirror region size of %u sectors" +#: lvcreate.c:482 +msgid "Snapshots of snapshots are not supported yet." msgstr "" -#: lvcreate.c:588 lvcreate.c:594 lvcreate.c:602 -msgid "log_name allocation failed. Remove new LV and retry." +#: lvcreate.c:487 +msgid "Snapshots of locked devices are not supported yet" msgstr "" -#: lvcreate.c:641 -msgid "Aborting. Failed to activate mirror log. Remove new LVs and retry." +#: lvcreate.c:496 +#, c-format +msgid "Unable to create logical volume %s with no extents" msgstr "" -#: lvcreate.c:647 -msgid "Aborting. Failed to wipe mirror log. Remove new LV and retry." +#: lvcreate.c:503 +#, c-format +msgid "Insufficient free extents (%u) in volume group %s: %u required" msgstr "" -#: lvcreate.c:653 -msgid "Aborting. Failed to deactivate mirror log. Remove new LV and retry." +#: lvcreate.c:509 +#, c-format +msgid "Number of stripes (%u) must not exceed number of physical volumes (%d)" msgstr "" -#: lvcreate.c:668 +#: lvcreate.c:528 msgid "Setting read ahead sectors" msgstr "" -#: lvcreate.c:676 +#: lvcreate.c:536 #, c-format msgid "Setting device number to (%d, %d)" msgstr "" -#: lvcreate.c:687 vgchange.c:327 +#: lvcreate.c:547 vgchange.c:224 #, c-format msgid "Volume group %s does not support tags" msgstr "" -#: lvcreate.c:731 +#: lvcreate.c:578 msgid "" "Aborting. Failed to activate snapshot exception store. Remove new LV and " "retry." msgstr "" -#: lvcreate.c:734 +#: lvcreate.c:581 msgid "Failed to activate new LV." msgstr "" -#: lvcreate.c:741 +#: lvcreate.c:588 msgid "" "Aborting. Failed to wipe snapshot exception store. Remove new LV and retry." msgstr "" -#: lvcreate.c:746 +#: lvcreate.c:593 #, c-format msgid "WARNING: \"%s\" not zeroed" msgstr "" -#: lvcreate.c:755 +#: lvcreate.c:602 msgid "Couldn't deactivate new snapshot." msgstr "" -#: lvcreate.c:761 +#: lvcreate.c:608 #, c-format msgid "Failed to suspend origin %s" msgstr "" -#: lvcreate.c:767 +#: lvcreate.c:614 msgid "Couldn't create snapshot." msgstr "" -#: lvcreate.c:776 +#: lvcreate.c:623 #, c-format msgid "Problem reactivating origin %s" msgstr "" -#: lvcreate.c:783 +#: lvcreate.c:630 #, c-format msgid "Logical volume \"%s\" created" msgstr "" -#: lvdisplay.c:39 lvdisplay.c:48 pvdisplay.c:62 pvdisplay.c:72 vgdisplay.c:67 -#: vgdisplay.c:76 +#: lvcreate.c:651 lvrename.c:107 lvresize.c:509 pvchange.c:56 pvmove.c:61 +#: vgcreate.c:139 vgextend.c:47 vgmerge.c:33 vgmerge.c:57 vgreduce.c:260 +#: vgrename.c:68 vgrename.c:102 vgsplit.c:173 vgsplit.c:197 +#, c-format +msgid "Can't get lock for %s" +msgstr "" + +#: lvdisplay.c:36 lvdisplay.c:45 pvdisplay.c:62 pvdisplay.c:71 vgdisplay.c:65 +#: vgdisplay.c:74 msgid "Incompatible options selected" msgstr "" -#: lvdisplay.c:53 +#: lvdisplay.c:50 msgid "Options -v and -c are incompatible" msgstr "" @@ -3882,91 +3644,109 @@ msgid "%-16.16s%s" msgstr "" -#: lvmcmdline.c:799 +#: lvmcmdline.c:798 msgid "Couldn't copy command line." msgstr "" -#: lvmcmdline.c:812 +#: lvmcmdline.c:811 #, c-format msgid "Parsing: %s" msgstr "" -#: lvmcmdline.c:818 +#: lvmcmdline.c:817 msgid "Error during parsing of command line." msgstr "" -#: lvmcmdline.c:827 +#: lvmcmdline.c:826 msgid "Updated config file invalid. Aborting." msgstr "" -#: lvmcmdline.c:836 +#: lvmcmdline.c:835 #, c-format msgid "Processing: %s" msgstr "" -#: lvmcmdline.c:839 +#: lvmcmdline.c:838 msgid "O_DIRECT will be used" msgstr "" -#: lvmcmdline.c:852 +#: lvmcmdline.c:851 #, c-format msgid "Locking type %d initialisation failed." msgstr "" -#: lvmcmdline.c:864 +#: lvmcmdline.c:863 msgid "Test mode: Wiping internal cache" msgstr "" -#: lvmcmdline.c:994 +#: lvmcmdline.c:921 +msgid "WARNING: Metadata changes will NOT be backed up" +msgstr "" + +#: lvmcmdline.c:941 +#, c-format +msgid "Couldn't create default archive path '%s/%s'." +msgstr "" + +#: lvmcmdline.c:950 lvmcmdline.c:970 +msgid "backup_init failed." +msgstr "" + +#: lvmcmdline.c:962 +#, c-format +msgid "Couldn't create default backup path '%s/%s'." +msgstr "" + +#: lvmcmdline.c:1058 #, c-format msgid "Line too long (max 255) beginning: %s" msgstr "" -#: lvmcmdline.c:1001 +#: lvmcmdline.c:1065 #, c-format msgid "Too many arguments: %s" msgstr "" -#: lvmcmdline.c:1133 +#: lvmcmdline.c:1197 msgid "$HOME/.lvm_history: path too long" msgstr "" -#: lvmcmdline.c:1148 +#: lvmcmdline.c:1212 #, c-format msgid "Couldn't read history from %s." msgstr "" -#: lvmcmdline.c:1163 +#: lvmcmdline.c:1227 #, c-format msgid "Couldn't write history to %s." msgstr "" -#: lvmcmdline.c:1196 +#: lvmcmdline.c:1260 msgid "Too many arguments, sorry." msgstr "" -#: lvmcmdline.c:1210 +#: lvmcmdline.c:1274 msgid "Exiting." msgstr "" -#: lvmcmdline.c:1216 +#: lvmcmdline.c:1280 #, c-format msgid "No such command '%s'. Try 'help'." msgstr "" -#: lvmcmdline.c:1342 +#: lvmcmdline.c:1406 msgid "Failed to create LVM1 tool pathname" msgstr "" -#: lvmcmdline.c:1390 +#: lvmcmdline.c:1443 msgid "Falling back to LVM1 tools, but no command specified." msgstr "" -#: lvmcmdline.c:1406 +#: lvmcmdline.c:1459 msgid "Please supply an LVM command." msgstr "" -#: lvmcmdline.c:1420 +#: lvmcmdline.c:1473 msgid "No such command. Try 'help'." msgstr "" @@ -4020,55 +3800,45 @@ #: lvremove.c:38 #, c-format -msgid "Can't remove logical volume %s used by a mirror" -msgstr "" - -#: lvremove.c:44 -#, c-format -msgid "Can't remove logical volume %s used as mirror log" -msgstr "" - -#: lvremove.c:50 -#, c-format msgid "Can't remove locked LV %s" msgstr "" -#: lvremove.c:58 +#: lvremove.c:46 #, c-format msgid "Can't remove open logical volume \"%s\"" msgstr "" -#: lvremove.c:67 +#: lvremove.c:55 #, c-format msgid "Logical volume \"%s\" not removed" msgstr "" -#: lvremove.c:78 +#: lvremove.c:66 #, c-format msgid "Unable to deactivate logical volume \"%s\"" msgstr "" -#: lvremove.c:84 +#: lvremove.c:72 #, c-format msgid "Removing snapshot %s" msgstr "" -#: lvremove.c:91 +#: lvremove.c:79 #, c-format msgid "Releasing logical volume \"%s\"" msgstr "" -#: lvremove.c:93 +#: lvremove.c:81 #, c-format msgid "Error releasing logical volume \"%s\"" msgstr "" -#: lvremove.c:106 +#: lvremove.c:94 #, c-format msgid "Logical volume \"%s\" successfully removed" msgstr "" -#: lvremove.c:113 +#: lvremove.c:101 msgid "Please enter one or more logical volume paths" msgstr "" @@ -4081,230 +3851,214 @@ msgid "Old and new logical volume names required" msgstr "" +#: lvrename.c:54 +msgid "Please provide a valid volume group name" +msgstr "" + #: lvrename.c:61 #, c-format msgid "Logical volume names must have the same volume group (\"%s\" or \"%s\")" msgstr "" #: lvrename.c:76 -msgid "New logical volume path exceeds maximum length of %zu!" +#, c-format +msgid "New logical volume path exceeds maximum length of %Zu!" msgstr "" #: lvrename.c:82 msgid "New logical volume name may not be blank" msgstr "" -#: lvrename.c:92 +#: lvrename.c:94 #, c-format msgid "New logical volume name \"%s\" is invalid" msgstr "" -#: lvrename.c:98 +#: lvrename.c:100 msgid "Old and new logical volume names must differ" msgstr "" -#: lvrename.c:131 +#: lvrename.c:104 vgrename.c:65 +#, c-format +msgid "Checking for existing volume group \"%s\"" +msgstr "" + +#: lvrename.c:133 #, c-format msgid "Existing logical volume \"%s\" not found in volume group \"%s\"" msgstr "" -#: lvrename.c:139 +#: lvrename.c:141 #, c-format msgid "Cannot rename locked LV %s" msgstr "" -#: lvrename.c:149 +#: lvrename.c:151 msgid "Failed to allocate space for new name" msgstr "" -#: lvrename.c:153 vgmerge.c:190 vgrename.c:134 +#: lvrename.c:155 vgmerge.c:163 vgrename.c:134 msgid "Writing out updated volume group" msgstr "" -#: lvrename.c:176 +#: lvrename.c:178 #, c-format msgid "Renamed \"%s\" to \"%s\" in volume group \"%s\"" msgstr "" -#: lvresize.c:80 +#: lvresize.c:79 msgid "Negative argument not permitted - use lvreduce" msgstr "" -#: lvresize.c:85 +#: lvresize.c:84 msgid "Positive sign not permitted - use lvextend" msgstr "" -#: lvresize.c:93 +#: lvresize.c:92 msgid "Please provide the logical volume name" msgstr "" -#: lvresize.c:138 +#: lvresize.c:136 #, c-format msgid "Volume group %s doesn't exist" msgstr "" -#: lvresize.c:143 +#: lvresize.c:141 #, c-format msgid "Volume group %s is exported" msgstr "" -#: lvresize.c:148 +#: lvresize.c:146 #, c-format msgid "Volume group %s is read-only" msgstr "" -#: lvresize.c:154 +#: lvresize.c:152 #, c-format msgid "Logical volume %s not found in volume group %s" msgstr "" -#: lvresize.c:163 +#: lvresize.c:161 msgid "Varied striping not supported. Ignoring." msgstr "" -#: lvresize.c:170 -msgid "Mirrors not supported. Ignoring." -msgstr "" - -#: lvresize.c:175 +#: lvresize.c:166 msgid "Stripesize may not be negative." msgstr "" -#: lvresize.c:182 +#: lvresize.c:173 msgid "Varied stripesize not supported. Ignoring." msgstr "" -#: lvresize.c:184 -msgid "Mirrors and striping cannot be combined yet." -msgstr "" - -#: lvresize.c:192 +#: lvresize.c:179 #, c-format msgid "Can't resize locked LV %s" msgstr "" -#: lvresize.c:219 +#: lvresize.c:184 +msgid "Snapshot origin volumes cannot be resized yet." +msgstr "" + +#: lvresize.c:211 #, c-format msgid "Unable to reduce %s below 1 extent" msgstr "" -#: lvresize.c:228 +#: lvresize.c:220 msgid "New size of 0 not permitted" msgstr "" -#: lvresize.c:233 lvresize.c:365 +#: lvresize.c:225 lvresize.c:330 #, c-format msgid "New size (%d extents) matches existing size (%d extents)" msgstr "" -#: lvresize.c:248 +#: lvresize.c:240 #, c-format msgid "VolumeType does not match (%s)" msgstr "" -#: lvresize.c:265 +#: lvresize.c:257 msgid "Please specify number of stripes (-i) and stripesize (-I)" msgstr "" -#: lvresize.c:279 +#: lvresize.c:271 #, c-format msgid "Using stripesize of last segment %dKB" msgstr "" -#: lvresize.c:303 -#, c-format -msgid "Extending %u mirror images." +#: lvresize.c:290 +msgid "Ignoring stripes and stripesize arguments when reducing" msgstr "" -#: lvresize.c:309 -msgid "Cannot vary number of mirrors in LV yet." -msgstr "" - -#: lvresize.c:319 -msgid "Ignoring stripes, stripesize and mirrors arguments when reducing" -msgstr "" - -#: lvresize.c:348 +#: lvresize.c:313 msgid "Stripesize for striped segment should not be 0!" msgstr "" -#: lvresize.c:357 +#: lvresize.c:322 #, c-format msgid "" "Rounding size (%d extents) down to stripe boundary size for segment (%d " "extents)" msgstr "" -#: lvresize.c:372 +#: lvresize.c:337 #, c-format msgid "New size given (%d extents) not larger than existing size (%d extents)" msgstr "" -#: lvresize.c:382 +#: lvresize.c:347 #, c-format msgid "New size given (%d extents) not less than existing size (%d extents)" msgstr "" -#: lvresize.c:392 -msgid "Mirrors cannot be resized while active yet." -msgstr "" - -#: lvresize.c:398 -msgid "Snapshot origin volumes cannot be reduced in size yet." -msgstr "" - -#: lvresize.c:406 -msgid "" -"Snapshot origin volumes can be resized only while inactive: try lvchange -an" -msgstr "" - -#: lvresize.c:414 +#: lvresize.c:357 msgid "Ignoring PVs on command line when reducing" msgstr "" -#: lvresize.c:425 +#: lvresize.c:368 msgid "lv_info failed: aborting" msgstr "" -#: lvresize.c:430 +#: lvresize.c:373 #, c-format msgid "Logical volume %s must be activated before resizing filesystem" msgstr "" -#: lvresize.c:436 +#: lvresize.c:379 #, c-format msgid "WARNING: Reducing active%s logical volume to %s" msgstr "" -#: lvresize.c:442 +#: lvresize.c:385 msgid "THIS MAY DESTROY YOUR DATA (filesystem etc.)" msgstr "" -#: lvresize.c:449 +#: lvresize.c:392 #, c-format msgid "Logical volume %s NOT reduced" msgstr "" -#: lvresize.c:460 +#: lvresize.c:403 #, c-format msgid "Couldn't create LV path for %s" msgstr "" -#: lvresize.c:468 +#: lvresize.c:411 msgid "Couldn't generate new LV size string" msgstr "" -#: lvresize.c:492 +#: lvresize.c:435 #, c-format msgid "%sing logical volume %s to %s" msgstr "" -#: lvresize.c:542 +#: lvresize.c:485 #, c-format msgid "Logical volume %s successfully resized" msgstr "" -#: lvresize.c:564 +#: lvresize.c:507 #, c-format msgid "Finding volume group %s" msgstr "" @@ -4318,723 +4072,514 @@ msgid "No additional command line arguments allowed" msgstr "" -#: metadata/lv_manip.c:78 -msgid "alloc_lv_segment: Missing segtype." -msgstr "" - -#: metadata/lv_manip.c:110 -msgid "Failed to find snapshot segtype" -msgstr "" - -#: metadata/lv_manip.c:118 -msgid "Couldn't allocate new snapshot segment." -msgstr "" - -#: metadata/lv_manip.c:236 -#, c-format -msgid "Segment extent reduction %unot divisible by #stripes %u" -msgstr "" - -#: metadata/lv_manip.c:381 -msgid "Striped mirrors are not supported yet" +#: metadata/lv_manip.c:102 +msgid "Couldn't allocate new parallel segment." msgstr "" -#: metadata/lv_manip.c:386 -msgid "Can't mix striping or mirroring with creation of a mirrored PV yet" +#: metadata/lv_manip.c:159 +msgid "striped mirrors are not supported yet" msgstr "" -#: metadata/lv_manip.c:392 -msgid "Can't mix striping or pvmove with a mirror log yet." -msgstr "" - -#: metadata/lv_manip.c:407 -msgid "allocation handle allocation failed" -msgstr "" - -#: metadata/lv_manip.c:415 -msgid "allocation pool creation failed" -msgstr "" - -#: metadata/lv_manip.c:462 -msgid "Couldn't allocate new LV segment." -msgstr "" - -#: metadata/lv_manip.c:542 -msgid "alloced_area allocation failed" -msgstr "" - -#: metadata/lv_manip.c:754 -msgid "_allocate called with no work to do!" -msgstr "" - -#: metadata/lv_manip.c:775 -msgid "Not enough PVs with free space available for parallel allocation." -msgstr "" - -#: metadata/lv_manip.c:777 -msgid "Consider --alloc anywhere if desperate." -msgstr "" - -#: metadata/lv_manip.c:785 +#: metadata/lv_manip.c:174 msgid "Couldn't allocate areas array." msgstr "" -#: metadata/lv_manip.c:822 +#: metadata/lv_manip.c:191 #, c-format msgid "" -"Insufficient suitable %sallocatable extents for logical volume %s: %u more " -"required" +"Insufficient allocatable extents suitable for parallel use for logical " +"volume %s: %u required" msgstr "" -#: metadata/lv_manip.c:846 -msgid "Couldn't allocate new zero segment." +#: metadata/lv_manip.c:231 +msgid "Couldn't allocate new stripe segment." msgstr "" -#: metadata/lv_manip.c:878 -msgid "allocate_extents does not handle virtual segments" +#: metadata/lv_manip.c:270 +msgid "Couldn't allocate new mirrored segment." msgstr "" -#: metadata/lv_manip.c:884 +#: metadata/lv_manip.c:332 #, c-format -msgid "Metadata format (%s) does not support required LV segment type (%s)." -msgstr "" - -#: metadata/lv_manip.c:887 -msgid "Consider changing the metadata format by running vgconvert." -msgstr "" - -#: metadata/lv_manip.c:928 -msgid "Missing segtype in lv_add_segment()." -msgstr "" - -#: metadata/lv_manip.c:933 -msgid "lv_add_segment cannot handle virtual segments" -msgstr "" - -#: metadata/lv_manip.c:947 -msgid "Couldn't merge segments after extending logical volume." -msgstr "" - -#: metadata/lv_manip.c:969 -msgid "Log segments can only be added to an empty LV" +msgid "" +"Insufficient allocatable extents (%u) for logical volume %s: %u required" msgstr "" -#: metadata/lv_manip.c:978 -msgid "Couldn't allocate new mirror log segment." +#: metadata/lv_manip.c:377 +#, c-format +msgid "" +"Insufficient contiguous allocatable extents (%u) for logical volume %s: %u " +"required" msgstr "" -#: metadata/lv_manip.c:1016 +#: metadata/lv_manip.c:410 #, c-format -msgid "Log LV %s is empty." +msgid "" +"Insufficient allocatable logical extents (%u) for logical volume %s: %u " +"required" msgstr "" -#: metadata/lv_manip.c:1026 -msgid "Couldn't allocate new mirror segment." +#: metadata/lv_manip.c:425 +msgid "Couldn't allocate new zero segment." msgstr "" -#: metadata/lv_manip.c:1087 -#, c-format -msgid "Aborting. Failed to extend %s." +#: metadata/lv_manip.c:490 +msgid "Unrecognised allocation policy: unable to set up logical volume." msgstr "" -#: metadata/lv_manip.c:1140 +#: metadata/lv_manip.c:556 #, c-format msgid "Maximum number of logical volumes (%u) reached in volume group %s" msgstr "" -#: metadata/lv_manip.c:1147 +#: metadata/lv_manip.c:563 msgid "Failed to generate unique name for the new logical volume" msgstr "" -#: metadata/lv_manip.c:1153 +#: metadata/lv_manip.c:568 #, c-format msgid "Creating logical volume %s" msgstr "" -#: metadata/lv_manip.c:1157 +#: metadata/lv_manip.c:572 msgid "lv_list allocation failed" msgstr "" -#: metadata/lv_manip.c:1167 +#: metadata/lv_manip.c:582 msgid "lv name strdup failed" msgstr "" -#: metadata/merge.c:72 -#, c-format -msgid "LV %s invalid: segment %u should begin at LE %u (found %u)." -msgstr "" - -#: metadata/merge.c:82 +#: metadata/lv_manip.c:628 #, c-format -msgid "LV %s: segment %u has inconsistent area_len %u" +msgid "Metadata format (%s) does not support required LV segment type (%s)." msgstr "" -#: metadata/merge.c:90 -#, c-format -msgid "LV %s: segment %u has unassigned area %u." +#: metadata/lv_manip.c:631 +msgid "Consider changing the metadata format by running vgconvert." msgstr "" -#: metadata/merge.c:98 -#, c-format -msgid "LV %s: segment %u has inconsistent PV area %u" +#: metadata/lv_manip.c:646 +msgid "Couldn't merge segments after extending logical volume." msgstr "" -#: metadata/merge.c:107 +#: metadata/lv_manip.c:683 #, c-format -msgid "LV %s: segment %u has inconsistent LV area %u" +msgid "Segment extent reduction %unot divisible by #stripes %u" msgstr "" -#: metadata/merge.c:128 +#: metadata/merge.c:69 #, c-format -msgid "LV %s: inconsistent LE count %u != %u" +msgid "LV %s invalid: segment %u should begin at LE %u (found %u)." msgstr "" -#: metadata/merge.c:149 +#: metadata/merge.c:95 #, c-format msgid "Unable to split the %s segment at LE %u in LV %s" msgstr "" -#: metadata/merge.c:162 -msgid "Couldn't allocate cloned LV segment." +#: metadata/merge.c:102 +msgid "Couldn't allocate new LV segment." msgstr "" -#: metadata/merge.c:167 +#: metadata/merge.c:110 msgid "LV segment tags duplication failed" msgstr "" -#: metadata/merge.c:194 +#: metadata/merge.c:126 #, c-format msgid "Split %s:%u[%u] at %u: %s LE %u" msgstr "" -#: metadata/merge.c:210 +#: metadata/merge.c:134 #, c-format msgid "Split %s:%u[%u] at %u: %s PE %u" msgstr "" -#: metadata/merge.c:217 metadata/metadata.c:469 +#: metadata/merge.c:141 #, c-format -msgid "Unassigned area %u found in segment" +msgid "Unrecognised segment type %u" msgstr "" -#: metadata/merge.c:236 +#: metadata/merge.c:169 #, c-format msgid "Segment with extent %u in LV %s not found" msgstr "" -#: metadata/metadata.c:35 +#: metadata/metadata.c:33 #, c-format msgid "Adding physical volume '%s' to volume group '%s'" msgstr "" -#: metadata/metadata.c:39 +#: metadata/metadata.c:37 #, c-format msgid "pv_list allocation for '%s' failed" msgstr "" -#: metadata/metadata.c:45 +#: metadata/metadata.c:43 #, c-format msgid "%s not identified as an existing physical volume" msgstr "" -#: metadata/metadata.c:51 +#: metadata/metadata.c:49 #, c-format msgid "Physical volume '%s' is already in volume group '%s'" msgstr "" -#: metadata/metadata.c:57 +#: metadata/metadata.c:55 #, c-format msgid "Physical volume %s is of different format type (%s)" msgstr "" -#: metadata/metadata.c:63 metadata/metadata.c:175 +#: metadata/metadata.c:61 metadata/metadata.c:120 #, c-format msgid "vg->name allocation failed for '%s'" msgstr "" -#: metadata/metadata.c:86 +#: metadata/metadata.c:84 #, c-format msgid "Format-specific setup of physical volume '%s' failed." msgstr "" -#: metadata/metadata.c:92 +#: metadata/metadata.c:90 #, c-format msgid "Physical volume '%s' listed more than once." msgstr "" -#: metadata/metadata.c:98 +#: metadata/metadata.c:96 #, c-format msgid "No space for '%s' - volume group '%s' holds max %d physical volume(s)." msgstr "" -#: metadata/metadata.c:125 -msgid "PV tags duplication failed" -msgstr "" - -#: metadata/metadata.c:146 -#, c-format -msgid "get_pv_from_vg_by_id: vg_read failed to read VG %s" -msgstr "" - -#: metadata/metadata.c:152 -#, c-format -msgid "Warning: Volume group %s is not consistent" -msgstr "" - -#: metadata/metadata.c:181 +#: metadata/metadata.c:127 #, c-format msgid "pv->vg_name allocation failed for '%s'" msgstr "" -#: metadata/metadata.c:198 +#: metadata/metadata.c:144 #, c-format msgid "Unable to add physical volume '%s' to volume group '%s'." msgstr "" -#: metadata/metadata.c:236 +#: metadata/metadata.c:182 #, c-format msgid "A volume group called '%s' already exists." msgstr "" -#: metadata/metadata.c:242 +#: metadata/metadata.c:188 #, c-format msgid "Couldn't create uuid for volume group '%s'." msgstr "" -#: metadata/metadata.c:283 metadata/metadata.c:934 metadata/metadata.c:977 +#: metadata/metadata.c:230 metadata/metadata.c:667 msgid "Failed to create format instance" msgstr "" -#: metadata/metadata.c:289 +#: metadata/metadata.c:236 #, c-format msgid "Format specific setup of volume group '%s' failed." msgstr "" -#: metadata/metadata.c:312 -#, c-format -msgid "New size %llu for %s%s not an exact number of new extents." -msgstr "" - -#: metadata/metadata.c:320 -#, c-format -msgid "New extent count %llu for %s%s exceeds 32 bits." -msgstr "" - -#: metadata/metadata.c:502 +#: metadata/metadata.c:273 #, c-format msgid "Failed to create random uuid for %s." msgstr "" -#: metadata/metadata.c:517 vgreduce.c:196 vgremove.c:62 +#: metadata/metadata.c:288 #, c-format msgid "%s: Couldn't get size." msgstr "" -#: metadata/metadata.c:523 +#: metadata/metadata.c:294 #, c-format msgid "WARNING: %s: Overriding real size. You could lose data." msgstr "" -#: metadata/metadata.c:525 +#: metadata/metadata.c:296 #, c-format msgid "%s: Pretending size is %llu sectors." msgstr "" -#: metadata/metadata.c:531 +#: metadata/metadata.c:302 #, c-format msgid "%s: Size must exceed minimum of %ld sectors." msgstr "" -#: metadata/metadata.c:549 +#: metadata/metadata.c:319 #, c-format msgid "%s: Format-specific setup of physical volume failed." msgstr "" -#: metadata/metadata.c:647 +#: metadata/metadata.c:433 #, c-format msgid "Physical volume %s not found" msgstr "" -#: metadata/metadata.c:652 +#: metadata/metadata.c:438 #, c-format msgid "Physical volume %s not in a volume group" msgstr "" -#: metadata/metadata.c:705 metadata/metadata.c:1066 -#, c-format -msgid "Internal error: PV segments corrupted in %s." -msgstr "" - -#: metadata/metadata.c:712 metadata/metadata.c:1073 -#, c-format -msgid "Internal error: LV segments corrupted in %s." -msgstr "" - -#: metadata/metadata.c:736 +#: metadata/metadata.c:489 #, c-format msgid "Cannot change metadata for partial volume group %s" msgstr "" -#: metadata/metadata.c:742 +#: metadata/metadata.c:495 msgid "Aborting vg_write: No metadata areas to write to!" msgstr "" -#: metadata/metadata.c:751 +#: metadata/metadata.c:505 msgid "Format does not support writing volumegroup metadata areas" msgstr "" -#: metadata/metadata.c:854 +#: metadata/metadata.c:596 msgid "vg allocation failed" msgstr "" -#: metadata/metadata.c:862 +#: metadata/metadata.c:605 msgid "vg name allocation failed" msgstr "" -#: metadata/metadata.c:871 +#: metadata/metadata.c:615 msgid "pv_list allocation failed" msgstr "" -#: metadata/metadata.c:901 -msgid "Internal error: vg_read requires vgname with pre-commit." -msgstr "" - -#: metadata/metadata.c:927 metadata/metadata.c:970 -#, c-format -msgid "Internal error: %s doesn't support pre-commit" -msgstr "" - -#: metadata/metadata.c:1014 -#, c-format -msgid "Inconsistent pre-commit metadata copies for volume group %s" -msgstr "" - -#: metadata/metadata.c:1025 +#: metadata/metadata.c:705 #, c-format msgid "Inconsistent metadata copies found for partial volume group %s" msgstr "" -#: metadata/metadata.c:1031 +#: metadata/metadata.c:711 #, c-format msgid "Inconsistent metadata copies found - updating to use version %u" msgstr "" -#: metadata/metadata.c:1034 +#: metadata/metadata.c:714 msgid "Automatic metadata correction failed" msgstr "" -#: metadata/metadata.c:1038 +#: metadata/metadata.c:718 msgid "Automatic metadata correction commit failed" msgstr "" -#: metadata/metadata.c:1045 +#: metadata/metadata.c:725 #, c-format msgid "WARNING: Interrupted pvmove detected in volume group %s" msgstr "" -#: metadata/metadata.c:1047 +#: metadata/metadata.c:727 msgid "Please restore the metadata by running vgcfgrestore." msgstr "" -#: metadata/metadata.c:1108 metadata/metadata.c:1138 +#: metadata/metadata.c:754 metadata/metadata.c:784 #, c-format msgid "Volume group %s metadata is inconsistent" msgstr "" -#: metadata/metadata.c:1126 +#: metadata/metadata.c:772 msgid "vg_read_by_vgid: get_vgs failed" msgstr "" -#: metadata/metadata.c:1158 +#: metadata/metadata.c:804 #, c-format msgid "Finding volume group for uuid %s" msgstr "" -#: metadata/metadata.c:1160 +#: metadata/metadata.c:806 #, c-format msgid "Volume group for uuid not found: %s" msgstr "" -#: metadata/metadata.c:1164 +#: metadata/metadata.c:810 #, c-format msgid "Found volume group \"%s\"" msgstr "" -#: metadata/metadata.c:1170 +#: metadata/metadata.c:816 #, c-format msgid "Can't find logical volume id %s" msgstr "" -#: metadata/metadata.c:1194 +#: metadata/metadata.c:840 #, c-format msgid "No physical volume label read from %s" msgstr "" -#: metadata/metadata.c:1204 +#: metadata/metadata.c:850 #, c-format msgid "pv allocation for '%s' failed" msgstr "" -#: metadata/metadata.c:1213 +#: metadata/metadata.c:858 #, c-format msgid "Failed to read existing physical volume '%s'" msgstr "" -#: metadata/metadata.c:1250 +#: metadata/metadata.c:889 msgid "PV list allocation failed" msgstr "" -#: metadata/metadata.c:1258 +#: metadata/metadata.c:897 msgid "get_pvs: get_vgs failed" msgstr "" -#: metadata/metadata.c:1278 +#: metadata/metadata.c:917 #, c-format msgid "Warning: Volume Group %s is not consistent" msgstr "" -#: metadata/metadata.c:1296 +#: metadata/metadata.c:935 msgid "Format does not support writing physical volumes" msgstr "" -#: metadata/metadata.c:1301 +#: metadata/metadata.c:940 #, c-format msgid "Assertion failed: can't _pv_write non-orphan PV (in VG %s)" msgstr "" -#: metadata/mirror.c:111 -msgid "img_lvs allocation failed. Remove new LV and retry." -msgstr "" - -#: metadata/mirror.c:118 metadata/mirror.c:124 -msgid "img_name allocation failed. Remove new LV and retry." -msgstr "" - -#: metadata/mirror.c:132 -msgid "Aborting. Failed to create submirror LV. Remove new LV and retry." -msgstr "" - -#: metadata/mirror.c:142 -#, c-format -msgid "" -"Aborting. Failed to add submirror segment to %s. Remove new LV and retry." -msgstr "" - -#: metadata/mirror.c:151 -msgid "Aborting. Failed to add mirror segment. Remove new LV and retry." -msgstr "" - -#: metadata/mirror.c:258 +#: metadata/mirror.c:122 #, c-format msgid "Matched PE range %u-%u against %s %u len %u" msgstr "" -#: metadata/mirror.c:267 metadata/mirror.c:498 +#: metadata/mirror.c:130 metadata/mirror.c:364 msgid "lv_list alloc failed" msgstr "" -#: metadata/mirror.c:277 +#: metadata/mirror.c:138 #, c-format msgid "Moving %s:%u-%u of %s/%s" msgstr "" -#: metadata/mirror.c:290 +#: metadata/mirror.c:152 msgid "Unable to allocate temporary LV for pvmove." msgstr "" -#: metadata/mirror.c:305 +#: metadata/mirror.c:169 #, c-format msgid "Moving %u extents of logical volume %s/%s" msgstr "" -#: metadata/mirror.c:337 +#: metadata/mirror.c:203 msgid "No segment found with LE" msgstr "" -#: metadata/mirror.c:348 +#: metadata/mirror.c:215 msgid "Incompatible segments" msgstr "" -#: metadata/mirror.c:373 -msgid "Missing error segtype" +#: metadata/mirror.c:237 +msgid "Missing striped segtype" msgstr "" -#: metadata/mirror.c:479 +#: metadata/mirror.c:344 msgid "lvs list alloc failed" msgstr "" -#: metadata/pv_manip.c:31 -msgid "pv_segment allocation failed" -msgstr "" - -#: metadata/pv_manip.c:122 -#, c-format -msgid "Segment with extent %u in PV %s not found" -msgstr "" - -#: metadata/pv_manip.c:162 -#, c-format -msgid "Missing PV segment on %s at %u." -msgstr "" - -#: metadata/pv_manip.c:179 -#, c-format -msgid "release_pv_segment with unallocated segment: %s PE %u" -msgstr "" - -#: metadata/pv_manip.c:239 -#, c-format -msgid "%s %u: %6u %6u: %s(%u:%u)" -msgstr "" - -#: metadata/pv_manip.c:245 -#, c-format -msgid "Gap in pvsegs: %u, %u" -msgstr "" - -#: metadata/pv_manip.c:251 -msgid "Wrong lvseg area type" -msgstr "" - -#: metadata/pv_manip.c:255 -msgid "Inconsistent pvseg pointers" -msgstr "" - -#: metadata/pv_manip.c:259 +#: metadata/pv_map.c:67 #, c-format -msgid "Inconsistent length: %u %u" +msgid "Physical extent %d of %s referenced by more than one logical volume" msgstr "" -#: metadata/pv_manip.c:270 -#, c-format -msgid "PV segment pe_count mismatch: %u != %u" +#: metadata/pv_map.c:87 +msgid "Couldn't create hash table for pv maps." msgstr "" -#: metadata/pv_manip.c:276 +#: metadata/pv_map.c:176 #, c-format -msgid "PV segment pe_alloc_count mismatch: %u != %u" +msgid "Allowing allocation on %s start PE %u length %u" msgstr "" -#: metadata/pv_manip.c:286 +#: metadata/pv_map.c:265 #, c-format -msgid "PV segment VG pv_count mismatch: %u != %u" +msgid "Couldn't create physical volume maps in %s" msgstr "" -#: metadata/pv_manip.c:292 +#: metadata/pv_map.c:271 #, c-format -msgid "PV segment VG free_count mismatch: %u != %u" +msgid "Couldn't fill extent allocation bitmaps in %s" msgstr "" -#: metadata/pv_manip.c:298 +#: metadata/pv_map.c:277 #, c-format -msgid "PV segment VG extent_count mismatch: %u != %u" +msgid "Couldn't create area maps in %s" msgstr "" -#: metadata/pv_map.c:46 +#: metadata/segtype.c:30 #, c-format -msgid "Allowing allocation on %s start PE %u length %u" +msgid "Unrecognised segment type %s" msgstr "" -#: metadata/pv_map.c:165 -msgid "create_pv_maps alloc failed" +#: metadata/snapshot_manip.c:85 +msgid "snapshot name list allocation failed" msgstr "" -#: metadata/pv_map.c:172 -#, c-format -msgid "Couldn't create physical volume maps in %s" +#: metadata/snapshot_manip.c:96 +msgid "snapshot_list structure allocation failed" msgstr "" -#: metadata/segtype.c:30 +#: metadata/snapshot_manip.c:119 #, c-format -msgid "Unrecognised segment type %s" +msgid "'%s' is already in use as a snapshot." msgstr "" -#: metadata/snapshot_manip.c:49 +#: metadata/snapshot_manip.c:137 #, c-format -msgid "'%s' is already in use as a snapshot." +msgid "Random UUID creation failed for snapshot %s." msgstr "" -#: metadata/snapshot_manip.c:90 -#, c-format -msgid "Failed to remove internal snapshot LV %s" +#: metadata/snapshot_manip.c:172 +msgid "Asked to remove an unknown snapshot." msgstr "" -#: mirror/mirrored.c:50 +#: mirror/mirrored.c:48 #, c-format msgid " Mirrors\t\t%u" msgstr "" -#: mirror/mirrored.c:51 +#: mirror/mirrored.c:49 #, c-format msgid " Mirror size\t\t%u" msgstr "" -#: mirror/mirrored.c:53 -#, c-format -msgid " Mirror log volume\t%s" -msgstr "" - -#: mirror/mirrored.c:59 -#, c-format -msgid " Mirror region size\t%s" -msgstr "" - -#: mirror/mirrored.c:62 +#: mirror/mirrored.c:50 msgid " Mirror original:" msgstr "" -#: mirror/mirrored.c:64 +#: mirror/mirrored.c:52 msgid " Mirror destination:" msgstr "" -#: mirror/mirrored.c:72 +#: mirror/mirrored.c:61 #, c-format msgid "Couldn't read 'mirror_count' for segment '%s'." msgstr "" -#: mirror/mirrored.c:91 +#: mirror/mirrored.c:79 #, c-format msgid "Couldn't read 'extents_moved' for segment '%s'." msgstr "" -#: mirror/mirrored.c:100 -#, c-format -msgid "Couldn't read 'region_size' for segment '%s'." -msgstr "" - -#: mirror/mirrored.c:108 -msgid "Mirror log type must be a string." -msgstr "" - -#: mirror/mirrored.c:113 -#, c-format -msgid "Unrecognised mirror log in segment %s." -msgstr "" - -#: mirror/mirrored.c:121 -#, c-format -msgid "Missing region size for mirror log for segment '%s'." -msgstr "" - -#: mirror/mirrored.c:127 +#: mirror/mirrored.c:86 #, c-format msgid "Couldn't find mirrors array for segment '%s'." msgstr "" -#: mirror/mirrored.c:156 +#: mirror/mirrored.c:111 msgid "struct mirr_state allocation failed" msgstr "" -#: mirror/mirrored.c:206 -msgid "Missing region size for mirror segment." +#: mirror/mirrored.c:165 +#, c-format +msgid "Using reduced mirror region size of %u sectors" msgstr "" -#: mirror/mirrored.c:247 +#: mirror/mirrored.c:193 #, c-format msgid "Mirror status: %s" msgstr "" -#: mirror/mirrored.c:250 +#: mirror/mirrored.c:196 #, c-format msgid "Failure parsing mirror status: %s" msgstr "" @@ -5043,22 +4588,22 @@ msgid "Not enough space to build temporary file string." msgstr "" -#: misc/lvm-file.c:101 +#: misc/lvm-file.c:97 #, c-format msgid "%s: rename to %s failed" msgstr "" -#: misc/lvm-file.c:147 +#: misc/lvm-file.c:143 #, c-format msgid "Creating directory \"%s\"" msgstr "" -#: misc/lvm-file.c:188 +#: misc/lvm-file.c:182 #, c-format msgid "Directory \"%s\" not found" msgstr "" -#: misc/lvm-file.c:219 +#: misc/lvm-file.c:213 msgid "sync_dir failed in strdup" msgstr "" @@ -5072,8 +4617,9 @@ msgid "Unable to open external %s library %s" msgstr "" -#: mm/dbg_malloc.c:239 -msgid "Huge memory allocation (size %zu) rejected - metadata corruption?" +#: mm/dbg_malloc.c:224 +#, c-format +msgid "Huge memory allocation (size %Zu) rejected - metadata corruption?" msgstr "" #: mm/memlock.c:100 @@ -5100,7 +4646,8 @@ msgstr "" #: mm/pool-fast.c:45 -msgid "Couldn't create memory pool %s (size %zu)" +#, c-format +msgid "Couldn't create memory pool %s (size %Zu)" msgstr "" #: mm/pool-fast.c:134 @@ -5108,14 +4655,15 @@ msgstr "" #: mm/pool-fast.c:223 -msgid "Out of memory. Requested %zu bytes." +#, c-format +msgid "Out of memory. Requested %Zu bytes." msgstr "" #: polldaemon.c:34 msgid "Forking background process" msgstr "" -#: polldaemon.c:39 toollib.c:984 +#: polldaemon.c:39 toollib.c:958 #, c-format msgid "fork failed: %s" msgstr "" @@ -5125,187 +4673,177 @@ msgid "Background process failed to setsid: %s" msgstr "" -#: polldaemon.c:82 +#: polldaemon.c:80 msgid "Failed to generate list of copied LVs: can't abort." msgstr "" -#: polldaemon.c:92 +#: polldaemon.c:90 msgid "ABORTING: Mirror percentage check failed." msgstr "" -#: polldaemon.c:98 polldaemon.c:100 +#: polldaemon.c:96 polldaemon.c:98 #, c-format msgid "%s: Moved: %.1f%%" msgstr "" -#: polldaemon.c:112 +#: polldaemon.c:107 msgid "ABORTING: Failed to generate list of copied LVs" msgstr "" -#: polldaemon.c:124 +#: polldaemon.c:119 msgid "ABORTING: Segment progression failed." msgstr "" -#: polldaemon.c:154 +#: polldaemon.c:146 #, c-format msgid "ABORTING: Can't reread VG for %s" msgstr "" -#: polldaemon.c:161 +#: polldaemon.c:153 #, c-format msgid "ABORTING: Can't find mirror LV in %s for %s" msgstr "" -#: polldaemon.c:189 +#: polldaemon.c:181 #, c-format msgid "Couldn't read volume group %s" msgstr "" -#: polldaemon.c:194 +#: polldaemon.c:186 #, c-format msgid "Volume Group %s inconsistent - skipping" msgstr "" -#: polldaemon.c:246 +#: polldaemon.c:238 #, c-format msgid "Checking progress every %u seconds" msgstr "" -#: pvchange.c:55 +#: pvchange.c:52 #, c-format msgid "Finding volume group of physical volume \"%s\"" msgstr "" -#: pvchange.c:65 +#: pvchange.c:62 #, c-format msgid "Unable to find volume group of \"%s\"" msgstr "" -#: pvchange.c:85 +#: pvchange.c:81 #, c-format msgid "Unable to find \"%s\" in volume group \"%s\"" msgstr "" -#: pvchange.c:91 +#: pvchange.c:88 #, c-format msgid "Volume group containing %s does not support tags" msgstr "" -#: pvchange.c:97 +#: pvchange.c:94 #, c-format msgid "Volume group containing %s has active logical volumes" msgstr "" -#: pvchange.c:106 +#: pvchange.c:103 #, c-format msgid "Can't change tag on Physical Volume %s not in volume group" msgstr "" -#: pvchange.c:111 +#: pvchange.c:108 msgid "Can't get lock for orphans" msgstr "" -#: pvchange.c:117 +#: pvchange.c:114 #, c-format msgid "Unable to read PV \"%s\"" msgstr "" -#: pvchange.c:126 +#: pvchange.c:123 #, c-format msgid "Allocatability not supported by orphan %s format PV %s" msgstr "" -#: pvchange.c:134 +#: pvchange.c:131 #, c-format msgid "Physical volume \"%s\" is already allocatable" msgstr "" -#: pvchange.c:144 +#: pvchange.c:141 #, c-format msgid "Physical volume \"%s\" is already unallocatable" msgstr "" -#: pvchange.c:154 +#: pvchange.c:151 #, c-format msgid "Setting physical volume \"%s\" allocatable" msgstr "" -#: pvchange.c:158 +#: pvchange.c:155 #, c-format msgid "Setting physical volume \"%s\" NOT allocatable" msgstr "" -#: pvchange.c:166 +#: pvchange.c:163 #, c-format msgid "Failed to add tag %s to physical volume %s" msgstr "" -#: pvchange.c:172 +#: pvchange.c:169 #, c-format msgid "Failed to remove tag %s from physical volume%s" msgstr "" -#: pvchange.c:180 +#: pvchange.c:177 #, c-format msgid "Failed to generate new random UUID for %s." msgstr "" -#: pvchange.c:188 -#, c-format -msgid "Changing uuid of %s to %s." -msgstr "" - -#: pvchange.c:195 -#, c-format -msgid "pv_write with new uuid failed for %s." -msgstr "" - -#: pvchange.c:204 +#: pvchange.c:183 #, c-format msgid "Updating physical volume \"%s\"" msgstr "" -#: pvchange.c:208 +#: pvchange.c:187 #, c-format msgid "Failed to store physical volume \"%s\" in volume group \"%s\"" msgstr "" -#: pvchange.c:217 +#: pvchange.c:196 #, c-format msgid "Failed to store physical volume \"%s\"" msgstr "" -#: pvchange.c:224 +#: pvchange.c:203 #, c-format msgid "Physical volume \"%s\" changed" msgstr "" -#: pvchange.c:246 +#: pvchange.c:225 msgid "Please give exactly one option of -x, -uuid, --addtag or --deltag" msgstr "" -#: pvchange.c:252 +#: pvchange.c:231 msgid "Please give a physical volume path" msgstr "" -#: pvchange.c:257 +#: pvchange.c:236 msgid "Option a and PhysicalVolumePath are exclusive" msgstr "" -#: pvchange.c:262 toollib.c:537 +#: pvchange.c:241 toollib.c:511 msgid "Using physical volume(s) on command line" msgstr "" -#: pvchange.c:267 +#: pvchange.c:246 #, c-format msgid "Failed to read physical volume %s" msgstr "" -#: pvchange.c:275 toollib.c:607 +#: pvchange.c:254 toollib.c:581 msgid "Scanning for physical volume names" msgstr "" -#: pvchange.c:286 +#: pvchange.c:265 #, c-format msgid "%d physical volume%s changed / %d physical volume%s not changed" msgstr "" @@ -5326,8 +4864,16 @@ msgid "%s: physical volume not initialized" msgstr "" -#: pvcreate.c:72 pvcreate.c:162 pvremove.c:76 vgcreate.c:139 vgextend.c:40 -#: vgremove.c:91 +#: pvcreate.c:66 pvscan.c:126 vgscan.c:51 +msgid "Wiping cache of LVM-capable devices" +msgstr "" + +#: pvcreate.c:68 pvscan.c:129 vgscan.c:54 +msgid "Wiping internal cache" +msgstr "" + +#: pvcreate.c:72 pvcreate.c:162 pvremove.c:76 vgcreate.c:134 vgextend.c:40 +#: vgremove.c:83 msgid "Can't get lock for orphan PVs" msgstr "" @@ -5379,17 +4925,17 @@ msgid "%s: Couldn't find device. Check your filters?" msgstr "" -#: pvcreate.c:202 vgconvert.c:127 +#: pvcreate.c:202 vgconvert.c:125 #, c-format msgid "Failed to setup physical volume \"%s\"" msgstr "" -#: pvcreate.c:206 vgconvert.c:138 +#: pvcreate.c:206 vgconvert.c:136 #, c-format msgid "Set up physical volume for \"%s\" with %llu available sectors" msgstr "" -#: pvcreate.c:211 vgconvert.c:143 +#: pvcreate.c:211 vgconvert.c:141 #, c-format msgid "Failed to wipe existing label on %s" msgstr "" @@ -5404,17 +4950,17 @@ msgid "%s not opened: device not zeroed" msgstr "" -#: pvcreate.c:226 vgconvert.c:150 +#: pvcreate.c:226 vgconvert.c:148 #, c-format msgid "Writing physical volume data to disk \"%s\"" msgstr "" -#: pvcreate.c:230 vgconvert.c:155 +#: pvcreate.c:230 vgconvert.c:153 #, c-format msgid "Failed to write physical volume \"%s\"" msgstr "" -#: pvcreate.c:234 vgconvert.c:161 +#: pvcreate.c:234 vgconvert.c:159 #, c-format msgid "Physical volume \"%s\" successfully created" msgstr "" @@ -5435,16 +4981,16 @@ msgid "Option y can only be given with option f" msgstr "" -#: pvcreate.c:271 vgconvert.c:205 +#: pvcreate.c:271 vgconvert.c:203 #, c-format msgid "labelsector must be less than %lu" msgstr "" -#: pvcreate.c:279 vgconvert.c:213 +#: pvcreate.c:279 vgconvert.c:211 msgid "Metadata parameters only apply to text format" msgstr "" -#: pvcreate.c:285 vgconvert.c:219 +#: pvcreate.c:285 vgconvert.c:217 msgid "Metadatacopies may only be 0, 1 or 2" msgstr "" @@ -5463,7 +5009,7 @@ msgid "\"%s\" is a new physical volume of \"%s\"" msgstr "" -#: pvdisplay.c:77 +#: pvdisplay.c:76 msgid "Option -v not allowed with option -c" msgstr "" @@ -5483,11 +5029,11 @@ msgid "No extents available for allocation" msgstr "" -#: pvmove.c:146 +#: pvmove.c:147 msgid "Creation of temporary pvmove LV failed" msgstr "" -#: pvmove.c:153 +#: pvmove.c:154 msgid "lvs_changed list struct allocation failed" msgstr "" @@ -5503,101 +5049,91 @@ #: pvmove.c:174 #, c-format -msgid "Skipping mirror log LV %s" -msgstr "" - -#: pvmove.c:178 -#, c-format -msgid "Skipping mirror image LV %s" -msgstr "" - -#: pvmove.c:182 -#, c-format msgid "Skipping locked LV %s" msgstr "" -#: pvmove.c:195 +#: pvmove.c:186 #, c-format msgid "No data to move for %s" msgstr "" -#: pvmove.c:206 +#: pvmove.c:197 msgid "Updating volume group metadata" msgstr "" -#: pvmove.c:208 pvmove.c:232 +#: pvmove.c:199 pvmove.c:223 msgid "ABORTING: Volume group metadata update failed." msgstr "" -#: pvmove.c:244 +#: pvmove.c:235 msgid "ABORTING: Temporary mirror activation failed. Run pvmove --abort." msgstr "" -#: pvmove.c:252 pvmove.c:434 +#: pvmove.c:243 pvmove.c:425 #, c-format msgid "Unable to reactivate logical volume \"%s\"" msgstr "" -#: pvmove.c:260 +#: pvmove.c:251 msgid "Unable to resume logical volumes" msgstr "" -#: pvmove.c:308 +#: pvmove.c:299 #, c-format msgid "Detected pvmove in progress for %s" msgstr "" -#: pvmove.c:310 +#: pvmove.c:301 msgid "Ignoring remaining command line arguments" msgstr "" -#: pvmove.c:314 +#: pvmove.c:304 msgid "ABORTING: Failed to generate list of moving LVs" msgstr "" -#: pvmove.c:322 +#: pvmove.c:312 msgid "ABORTING: Temporary mirror activation failed." msgstr "" -#: pvmove.c:399 +#: pvmove.c:390 msgid "ABORTING: Removal of temporary mirror failed" msgstr "" -#: pvmove.c:405 pvmove.c:424 pvmove.c:458 +#: pvmove.c:396 pvmove.c:415 pvmove.c:449 msgid "ABORTING: Failed to write new data locations to disk." msgstr "" -#: pvmove.c:412 +#: pvmove.c:403 msgid "Locking LVs to remove temporary mirror failed" msgstr "" -#: pvmove.c:418 +#: pvmove.c:409 msgid "Suspension of temporary mirror LV failed" msgstr "" -#: pvmove.c:444 +#: pvmove.c:435 #, c-format msgid "ABORTING: Unable to deactivate temporary logical volume \"%s\"" msgstr "" -#: pvmove.c:449 +#: pvmove.c:440 msgid "Removing temporary pvmove LV" msgstr "" -#: pvmove.c:451 +#: pvmove.c:442 msgid "ABORTING: Removal of temporary pvmove LV failed" msgstr "" -#: pvmove.c:456 +#: pvmove.c:447 msgid "Writing out final volume group after pvmove" msgstr "" -#: pvmove.c:476 +#: pvmove.c:467 #, c-format msgid "ABORTING: Can't reread PV %s" msgstr "" -#: pvmove.c:512 toollib.c:908 +#: pvmove.c:503 toollib.c:882 msgid "Failed to clone PV name" msgstr "" @@ -5651,15 +5187,15 @@ msgid "WARNING: only considering physical volumes %s" msgstr "" -#: pvscan.c:129 +#: pvscan.c:132 msgid "Walking through all physical volumes" msgstr "" -#: pvscan.c:182 +#: pvscan.c:185 msgid "No matching physical volumes found" msgstr "" -#: pvscan.c:186 +#: pvscan.c:189 #, c-format msgid "Total: %d [%s] / in use: %d [%s] / in no VG: %d [%s]" msgstr "" @@ -5697,141 +5233,136 @@ msgid "Parse error in regex" msgstr "" -#: report/report.c:125 report/report.c:541 report/report.c:581 -#: report/report.c:609 +#: report/report.c:124 report/report.c:527 report/report.c:555 msgid "pool_strdup failed" msgstr "" -#: report/report.c:152 report/report.c:211 +#: report/report.c:151 report/report.c:210 msgid "pool_begin_object failed" msgstr "" -#: report/report.c:172 report/report.c:183 report/report.c:189 -#: report/report.c:195 report/report.c:218 report/report.c:224 -#: report/report.c:1322 +#: report/report.c:171 report/report.c:182 report/report.c:188 +#: report/report.c:194 report/report.c:217 report/report.c:223 +#: report/report.c:1265 msgid "pool_grow_object failed" msgstr "" -#: report/report.c:178 +#: report/report.c:177 msgid "Extent number lvm_snprintf failed" msgstr "" -#: report/report.c:271 report/report.c:276 report/report.c:332 -#: report/report.c:409 report/report.c:436 report/report.c:529 -#: report/report.c:586 report/report.c:614 report/report.c:731 -#: report/report.c:754 report/report.c:759 report/report.c:783 -#: report/report.c:788 report/report.c:826 report/report.c:847 -#: report/report.c:872 report/report.c:887 +#: report/report.c:270 report/report.c:275 report/report.c:331 +#: report/report.c:404 report/report.c:431 report/report.c:532 +#: report/report.c:560 report/report.c:677 report/report.c:700 +#: report/report.c:705 report/report.c:729 report/report.c:734 +#: report/report.c:772 report/report.c:792 report/report.c:817 +#: report/report.c:832 msgid "pool_alloc failed" msgstr "" -#: report/report.c:281 +#: report/report.c:280 #, c-format msgid "int too big: %d" msgstr "" -#: report/report.c:534 -msgid "lvname snprintf failed" -msgstr "" - -#: report/report.c:764 +#: report/report.c:710 #, c-format msgid "uint32 too big: %u" msgstr "" -#: report/report.c:793 +#: report/report.c:739 #, c-format msgid "int32 too big: %d" msgstr "" -#: report/report.c:852 +#: report/report.c:797 msgid "snapshot percentage too large" msgstr "" -#: report/report.c:892 +#: report/report.c:837 msgid "copy percentage too large" msgstr "" -#: report/report.c:949 report/report.c:985 +#: report/report.c:894 report/report.c:933 msgid "struct field_properties allocation failed" msgstr "" -#: report/report.c:998 +#: report/report.c:946 #, c-format msgid "Ignoring duplicate sort field: %s" msgstr "" -#: report/report.c:1030 +#: report/report.c:978 msgid "Missing sort field name" msgstr "" -#: report/report.c:1061 report/report.c:1083 +#: report/report.c:1009 report/report.c:1031 #, c-format msgid "Unrecognised field: %.*s" msgstr "" -#: report/report.c:1099 +#: report/report.c:1047 msgid "report_handle pool_zalloc failed" msgstr "" -#: report/report.c:1140 +#: report/report.c:1085 msgid "Allocation of memory pool for report failed" msgstr "" -#: report/report.c:1157 +#: report/report.c:1100 msgid "Can't report LV and PV fields at the same time" msgstr "" -#: report/report.c:1198 +#: report/report.c:1140 msgid "report_object: One of *lv and *pv must be NULL!" msgstr "" -#: report/report.c:1203 +#: report/report.c:1145 msgid "struct row allocation failed" msgstr "" -#: report/report.c:1212 +#: report/report.c:1154 msgid "row sort value structure allocation failed" msgstr "" -#: report/report.c:1224 +#: report/report.c:1168 msgid "struct field allocation failed" msgstr "" -#: report/report.c:1254 +#: report/report.c:1195 #, c-format msgid "report function failed for field %s" msgstr "" -#: report/report.c:1294 +#: report/report.c:1236 msgid "pool_begin_object failed for headings" msgstr "" -#: report/report.c:1307 +#: report/report.c:1250 msgid "snprintf heading failed" msgstr "" -#: report/report.c:1330 +#: report/report.c:1273 msgid "Failed to generate report headings for printing" msgstr "" -#: report/report.c:1389 +#: report/report.c:1333 msgid "sort array allocation failed" msgstr "" -#: report/report.c:1432 +#: report/report.c:1378 msgid "pool_begin_object failed for row" msgstr "" -#: report/report.c:1450 report/report.c:1459 +#: report/report.c:1396 report/report.c:1405 msgid "snprintf repstr failed" msgstr "" -#: report/report.c:1474 +#: report/report.c:1420 msgid "pool_grow_object failed for row" msgstr "" -#: report/report.c:1487 +#: report/report.c:1433 msgid "Failed to generate row for printing" msgstr "" @@ -5840,17 +5371,17 @@ msgid "Volume group %s not found" msgstr "" -#: reporter.c:64 reporter.c:105 toollib.c:236 toollib.c:346 +#: reporter.c:65 toollib.c:233 toollib.c:321 #, c-format msgid "Can't lock %s: skipping" msgstr "" -#: reporter.c:69 reporter.c:110 +#: reporter.c:70 #, c-format msgid "Can't read %s: skipping" msgstr "" -#: reporter.c:212 +#: reporter.c:160 #, c-format msgid "Invalid options string: %s" msgstr "" @@ -5875,37 +5406,37 @@ msgid "Unknown logical volume specified for snapshot origin." msgstr "" -#: striped/striped.c:43 +#: striped/striped.c:42 #, c-format msgid " Stripes\t\t%u" msgstr "" -#: striped/striped.c:44 +#: striped/striped.c:43 #, c-format msgid " Stripe size\t\t%u KB" msgstr "" -#: striped/striped.c:47 +#: striped/striped.c:46 #, c-format msgid " Stripe %d:" msgstr "" -#: striped/striped.c:57 +#: striped/striped.c:56 #, c-format msgid "Couldn't read 'stripe_count' for segment '%s'." msgstr "" -#: striped/striped.c:72 +#: striped/striped.c:71 #, c-format msgid "Couldn't read stripe_size for segment '%s'." msgstr "" -#: striped/striped.c:78 +#: striped/striped.c:77 #, c-format msgid "Couldn't find stripes array for segment '%s'." msgstr "" -#: striped/striped.c:175 +#: striped/striped.c:164 msgid "Internal error: striped target with no stripes" msgstr "" @@ -5927,202 +5458,158 @@ "Metadata in LVM1 format can still be displayed using LVM1's pvdata command." msgstr "" -#: toollib.c:94 +#: toollib.c:91 msgid "One or more specified logical volume(s) not found." msgstr "" -#: toollib.c:130 +#: toollib.c:127 msgid "Using logical volume(s) on command line" msgstr "" -#: toollib.c:143 toollib.c:399 toollib.c:543 toollib.c:889 +#: toollib.c:140 toollib.c:374 toollib.c:517 toollib.c:863 #, c-format msgid "Skipping invalid tag %s" msgstr "" -#: toollib.c:170 toollib.c:648 toollib.c:659 +#: toollib.c:167 toollib.c:622 toollib.c:633 #, c-format msgid "\"%s\": Invalid path for Logical Volume" msgstr "" -#: toollib.c:211 +#: toollib.c:208 msgid "vg/lv string alloc failed" msgstr "" -#: toollib.c:224 +#: toollib.c:221 msgid "Finding all logical volumes" msgstr "" -#: toollib.c:226 toollib.c:437 +#: toollib.c:223 toollib.c:412 msgid "No volume groups found" msgstr "" -#: toollib.c:246 vgcfgbackup.c:55 vgck.c:22 vgreduce.c:287 vgscan.c:22 +#: toollib.c:243 vgcfgbackup.c:55 vgck.c:22 vgreduce.c:282 vgscan.c:22 #, c-format msgid "Volume group \"%s\" not found" msgstr "" -#: toollib.c:249 vgchange.c:404 vgck.c:27 vgconvert.c:43 vgscan.c:29 +#: toollib.c:246 vgchange.c:301 vgck.c:27 vgconvert.c:43 vgscan.c:29 #, c-format msgid "Volume group \"%s\" inconsistent" msgstr "" -#: toollib.c:393 +#: toollib.c:368 msgid "Using volume group(s) on command line" msgstr "" -#: toollib.c:420 +#: toollib.c:395 #, c-format msgid "Invalid volume group name: %s" msgstr "" -#: toollib.c:435 +#: toollib.c:410 msgid "Finding all volume groups" msgstr "" -#: toollib.c:559 toollib.c:914 +#: toollib.c:533 toollib.c:888 #, c-format msgid "Physical Volume \"%s\" not found in Volume Group \"%s\"" msgstr "" -#: toollib.c:570 +#: toollib.c:544 #, c-format msgid "Failed to read physical volume \"%s\"" msgstr "" -#: toollib.c:596 +#: toollib.c:570 msgid "Using all physical volume(s) in volume group" msgstr "" -#: toollib.c:666 +#: toollib.c:640 msgid "Allocation of vg_name failed" msgstr "" -#: toollib.c:676 +#: toollib.c:650 #, c-format msgid "Path required for Logical Volume \"%s\"" msgstr "" -#: toollib.c:707 +#: toollib.c:681 #, c-format msgid "Environment Volume Group in LVM_VG_NAME invalid: \"%s\"" msgstr "" -#: toollib.c:723 +#: toollib.c:697 #, c-format msgid "Adding PE range: start PE %u length %u" msgstr "" -#: toollib.c:731 +#: toollib.c:705 #, c-format msgid "Overlapping PE ranges detected (%u-%u, %u-%u)" msgstr "" -#: toollib.c:740 toollib.c:877 toollib.c:934 +#: toollib.c:714 toollib.c:851 toollib.c:908 msgid "Allocation of list failed" msgstr "" -#: toollib.c:804 +#: toollib.c:778 #, c-format msgid "PE range error: start extent %u to end extent %u" msgstr "" -#: toollib.c:819 +#: toollib.c:793 #, c-format msgid "Physical extent parsing error at %s" msgstr "" -#: toollib.c:832 +#: toollib.c:806 #, c-format msgid "Physical volume %s not allocatable" msgstr "" -#: toollib.c:838 +#: toollib.c:812 #, c-format msgid "No free extents on physical volume \"%s\"" msgstr "" -#: toollib.c:843 toollib.c:941 +#: toollib.c:817 toollib.c:915 msgid "Unable to allocate physical volume list." msgstr "" -#: toollib.c:850 +#: toollib.c:824 msgid "Allocation of pe_ranges list failed" msgstr "" -#: toollib.c:922 +#: toollib.c:896 msgid "No specified PVs have space available" msgstr "" -#: toollib.c:964 +#: toollib.c:938 #, c-format msgid "Can't lock %s for metadata recovery: skipping" msgstr "" -#: toollib.c:981 +#: toollib.c:955 #, c-format msgid "Executing: %s %s %s %s" msgstr "" -#: toollib.c:998 +#: toollib.c:972 #, c-format msgid "wait4 child process %u failed: %s" msgstr "" -#: toollib.c:1004 +#: toollib.c:978 #, c-format msgid "Child %u exited abnormally" msgstr "" -#: toollib.c:1009 +#: toollib.c:983 #, c-format msgid "%s failed: %u" msgstr "" -#: toollib.c:1019 -msgid "" -"Names starting \"snapshot\" are reserved. Please choose a different LV name." -msgstr "" - -#: toollib.c:1025 -msgid "" -"Names starting \"pvmove\" are reserved. Please choose a different LV name." -msgstr "" - -#: toollib.c:1031 -msgid "" -"Names including \"_mlog\" are reserved. Please choose a different LV name." -msgstr "" - -#: toollib.c:1037 -msgid "" -"Names including \"_mimage\" are reserved. Please choose a different LV name." -msgstr "" - -#: toollib.c:1054 -#, c-format -msgid "%s: already exists in filesystem" -msgstr "" - -#: toollib.c:1077 -msgid "Name allocation failed - device not zeroed" -msgstr "" - -#: toollib.c:1083 -#, c-format -msgid "Name too long - device not zeroed (%s)" -msgstr "" - -#: toollib.c:1087 -#, c-format -msgid "Zeroing start of logical volume \"%s\"" -msgstr "" - -#: toollib.c:1090 -#, c-format -msgid "%s: not found: device not zeroed" -msgstr "" - #: uuid/uuid.c:133 msgid "UUID contains invalid character" msgstr "" @@ -6203,145 +5690,101 @@ #: vgchange.c:87 #, c-format -msgid "Locking inactive: ignoring clustered volume group %s" -msgstr "" - -#: vgchange.c:97 -#, c-format msgid "%d logical volume(s) in volume group \"%s\" already active" msgstr "" -#: vgchange.c:101 +#: vgchange.c:91 #, c-format msgid "Activated logical volumes in volume group \"%s\"" msgstr "" -#: vgchange.c:105 +#: vgchange.c:95 #, c-format msgid "Deactivated logical volumes in volume group \"%s\"" msgstr "" -#: vgchange.c:108 +#: vgchange.c:98 #, c-format msgid "%d logical volume(s) in volume group \"%s\" now active" msgstr "" -#: vgchange.c:120 vgcreate.c:47 +#: vgchange.c:110 vgcreate.c:47 msgid "Volume Group allocation policy cannot inherit from anything" msgstr "" -#: vgchange.c:126 +#: vgchange.c:116 #, c-format msgid "Volume group allocation policy is already %s" msgstr "" -#: vgchange.c:141 vgchange.c:176 vgchange.c:211 vgchange.c:253 vgchange.c:311 -#: vgchange.c:353 vgchange.c:385 +#: vgchange.c:131 vgchange.c:166 vgchange.c:208 vgchange.c:250 vgchange.c:282 #, c-format msgid "Volume group \"%s\" successfully changed" msgstr "" -#: vgchange.c:152 +#: vgchange.c:142 #, c-format msgid "Volume group \"%s\" is already resizeable" msgstr "" -#: vgchange.c:158 +#: vgchange.c:148 #, c-format msgid "Volume group \"%s\" is already not resizeable" msgstr "" -#: vgchange.c:187 -#, c-format -msgid "Volume group \"%s\" is already clustered" -msgstr "" - -#: vgchange.c:193 -#, c-format -msgid "Volume group \"%s\" is already not clustered" -msgstr "" - -#: vgchange.c:222 +#: vgchange.c:177 #, c-format msgid "Volume group \"%s\" must be resizeable to change MaxLogicalVolume" msgstr "" -#: vgchange.c:231 +#: vgchange.c:186 msgid "MaxLogicalVolume limit is 255" msgstr "" -#: vgchange.c:237 +#: vgchange.c:192 #, c-format msgid "" "MaxLogicalVolume is less than the current number %d of logical volume(s) for " "\"%s\"" msgstr "" -#: vgchange.c:263 -#, c-format -msgid "Volume group \"%s\" must be resizeable to change PE size" -msgstr "" - -#: vgchange.c:269 vgcreate.c:64 -msgid "Physical extent size may not be negative" -msgstr "" - -#: vgchange.c:275 vgcreate.c:83 -msgid "Physical extent size may not be zero" -msgstr "" - -#: vgchange.c:280 -#, c-format -msgid "Physical extent size of VG %s is already %s" -msgstr "" - -#: vgchange.c:286 -msgid "Physical extent size must be a power of 2." -msgstr "" - -#: vgchange.c:293 -msgid "New extent size is not a perfect fit" -msgstr "" - -#: vgchange.c:336 vgcreate.c:121 +#: vgchange.c:233 vgcreate.c:127 #, c-format msgid "Failed to add tag %s to volume group %s" msgstr "" -#: vgchange.c:342 +#: vgchange.c:239 #, c-format msgid "Failed to remove tag %s from volume group %s" msgstr "" -#: vgchange.c:363 +#: vgchange.c:260 msgid "Volume group has active logical volumes" msgstr "" -#: vgchange.c:371 +#: vgchange.c:268 #, c-format msgid "Failed to generate new random UUID for VG %s." msgstr "" -#: vgchange.c:397 vgconvert.c:36 vgexport.c:23 +#: vgchange.c:294 vgconvert.c:36 vgexport.c:23 #, c-format msgid "Unable to find volume group \"%s\"" msgstr "" -#: vgchange.c:457 -msgid "" -"One of -a, -c, -l, -s, -x, --uuid, --alloc, --addtag or --deltag required" +#: vgchange.c:347 +msgid "One of -a, -l, -x, --alloc, --addtag, --deltag or --uuid required" msgstr "" -#: vgchange.c:468 -msgid "" -"Only one of -a, -c, -l, -s, -x, --uuid, --alloc, --addtag or --deltag allowed" +#: vgchange.c:357 +msgid "Only one of -a, -l, -x, --alloc, --addtag, --deltag or --uuid allowed" msgstr "" -#: vgchange.c:475 +#: vgchange.c:364 msgid "--ignorelockingfailure only available with -a" msgstr "" -#: vgchange.c:481 +#: vgchange.c:370 msgid "-A option not necessary with -a option" msgstr "" @@ -6355,47 +5798,47 @@ msgid "Archive of \"%s\" metadata failed." msgstr "" -#: vgconvert.c:100 +#: vgconvert.c:98 #, c-format msgid "Logical volume %s must be deactivated before conversion." msgstr "" -#: vgconvert.c:130 vgconvert.c:145 vgconvert.c:157 vgconvert.c:170 -#: vgconvert.c:186 +#: vgconvert.c:128 vgconvert.c:143 vgconvert.c:155 vgconvert.c:168 +#: vgconvert.c:184 msgid "Use pvcreate and vgcfgrestore to repair from archived metadata." msgstr "" -#: vgconvert.c:166 +#: vgconvert.c:164 #, c-format msgid "Deleting existing metadata for VG %s" msgstr "" -#: vgconvert.c:168 +#: vgconvert.c:166 #, c-format msgid "Removal of existing metadata for %s failed." msgstr "" -#: vgconvert.c:177 +#: vgconvert.c:175 #, c-format msgid "Test mode: Skipping metadata writing for VG %s in format %s" msgstr "" -#: vgconvert.c:182 +#: vgconvert.c:180 #, c-format msgid "Writing metadata for VG %s using format %s" msgstr "" -#: vgconvert.c:185 +#: vgconvert.c:183 #, c-format msgid "Conversion failed for volume group %s." msgstr "" -#: vgconvert.c:190 +#: vgconvert.c:188 #, c-format msgid "Volume group %s successfully converted" msgstr "" -#: vgconvert.c:200 +#: vgconvert.c:198 msgid "Please enter volume group(s)" msgstr "" @@ -6411,6 +5854,10 @@ msgid "Number of volumes may not exceed 255" msgstr "" +#: vgcreate.c:64 +msgid "Physical extent size may not be negative" +msgstr "" + #: vgcreate.c:69 msgid "Max Logical Volumes may not be negative" msgstr "" @@ -6419,26 +5866,35 @@ msgid "Max Physical Volumes may not be negative" msgstr "" -#: vgcreate.c:92 vgrename.c:55 vgsplit.c:226 +#: vgcreate.c:83 +msgid "Physical extent size may not be zero" +msgstr "" + +#: vgcreate.c:93 +#, c-format +msgid "%s: already exists in filesystem" +msgstr "" + +#: vgcreate.c:98 vgrename.c:55 #, c-format msgid "New volume group name \"%s\" is invalid" msgstr "" -#: vgcreate.c:102 +#: vgcreate.c:108 #, c-format msgid "Warning: Setting maxlogicalvolumes to %d (0 means unlimited)" msgstr "" -#: vgcreate.c:106 +#: vgcreate.c:112 #, c-format msgid "Warning: Setting maxphysicalvolumes to %d (0 means unlimited)" msgstr "" -#: vgcreate.c:116 +#: vgcreate.c:122 msgid "Volume group format does not support tags" msgstr "" -#: vgcreate.c:167 +#: vgcreate.c:162 #, c-format msgid "Volume group \"%s\" successfully created" msgstr "" @@ -6457,11 +5913,11 @@ msgid "--- Physical volumes ---" msgstr "" -#: vgdisplay.c:81 +#: vgdisplay.c:79 msgid "Option -c is not allowed with option -s" msgstr "" -#: vgdisplay.c:86 +#: vgdisplay.c:84 msgid "Option -A is not allowed with volume group names" msgstr "" @@ -6501,7 +5957,7 @@ msgid "Please enter physical volume(s)" msgstr "" -#: vgextend.c:44 vgmerge.c:31 vgmerge.c:55 vgsplit.c:187 vgsplit.c:211 +#: vgextend.c:44 vgmerge.c:31 vgmerge.c:55 vgsplit.c:171 vgsplit.c:195 #, c-format msgid "Checking for volume group \"%s\"" msgstr "" @@ -6546,12 +6002,12 @@ msgid "Volume group \"%s\" successfully imported" msgstr "" -#: vgmerge.c:27 vgsplit.c:183 +#: vgmerge.c:27 vgsplit.c:167 #, c-format msgid "Duplicate volume group name \"%s\"" msgstr "" -#: vgmerge.c:79 vgsplit.c:233 +#: vgmerge.c:79 vgsplit.c:211 #, c-format msgid "Logical volumes in \"%s\" must be inactive" msgstr "" @@ -6576,22 +6032,12 @@ msgid "Duplicate logical volume name \"%s\" in \"%s\" and \"%s\"" msgstr "" -#: vgmerge.c:153 -#, c-format -msgid "Failed to generate new random LVID for %s" -msgstr "" - -#: vgmerge.c:164 -#, c-format -msgid "Changed LVID for %s to %s" -msgstr "" - -#: vgmerge.c:202 +#: vgmerge.c:175 #, c-format msgid "Volume group \"%s\" successfully merged into \"%s\"" msgstr "" -#: vgmerge.c:219 +#: vgmerge.c:192 msgid "Please enter 2 or more volume groups to merge" msgstr "" @@ -6629,79 +6075,79 @@ msgid "Deactivating (if active) logical volume %s (origin of %s)" msgstr "" -#: vgreduce.c:93 vgreduce.c:102 +#: vgreduce.c:95 vgreduce.c:104 #, c-format msgid "Removing LV %s from VG %s" msgstr "" -#: vgreduce.c:172 +#: vgreduce.c:174 #, c-format msgid "Physical volume \"%s\" still in use" msgstr "" -#: vgreduce.c:177 +#: vgreduce.c:179 #, c-format msgid "Can't remove final physical volume \"%s\" from volume group \"%s\"" msgstr "" -#: vgreduce.c:187 +#: vgreduce.c:189 #, c-format msgid "Removing \"%s\" from volume group \"%s\"" msgstr "" -#: vgreduce.c:205 +#: vgreduce.c:200 #, c-format msgid "Removal of physical volume \"%s\" from \"%s\" failed" msgstr "" -#: vgreduce.c:211 +#: vgreduce.c:206 #, c-format msgid "" "Failed to clear metadata from physical volume \"%s\" after removal from \"%s" "\"" msgstr "" -#: vgreduce.c:219 +#: vgreduce.c:214 #, c-format msgid "Removed \"%s\" from volume group \"%s\"" msgstr "" -#: vgreduce.c:232 +#: vgreduce.c:227 msgid "Please give volume group name and physical volume paths" msgstr "" -#: vgreduce.c:238 +#: vgreduce.c:233 msgid "Please give volume group name" msgstr "" -#: vgreduce.c:244 +#: vgreduce.c:239 msgid "Please enter physical volume paths or option -a" msgstr "" -#: vgreduce.c:249 +#: vgreduce.c:244 msgid "Option -a and physical volume paths mutually exclusive" msgstr "" -#: vgreduce.c:255 +#: vgreduce.c:250 msgid "Please only specify the volume group" msgstr "" -#: vgreduce.c:278 +#: vgreduce.c:273 #, c-format msgid "Volume group \"%s\" is already consistent" msgstr "" -#: vgreduce.c:309 +#: vgreduce.c:304 #, c-format msgid "Failed to write out a consistent VG for %s" msgstr "" -#: vgreduce.c:317 +#: vgreduce.c:312 #, c-format msgid "Wrote out consistent volume group %s" msgstr "" -#: vgreduce.c:333 +#: vgreduce.c:328 #, c-format msgid "Volume group \"%s\" is not reducible" msgstr "" @@ -6730,17 +6176,17 @@ msgid "Removing physical volume \"%s\" from volume group \"%s\"" msgstr "" -#: vgremove.c:69 +#: vgremove.c:61 #, c-format msgid "Failed to remove physical volume \"%s\" from volume group \"%s\"" msgstr "" -#: vgremove.c:79 +#: vgremove.c:71 #, c-format msgid "Volume group \"%s\" successfully removed" msgstr "" -#: vgremove.c:81 +#: vgremove.c:73 #, c-format msgid "Volume group \"%s\" not properly removed" msgstr "" @@ -6797,11 +6243,11 @@ msgid "Found %svolume group \"%s\" using metadata type %s" msgstr "" -#: vgscan.c:49 +#: vgscan.c:47 msgid "Too many parameters on command line" msgstr "" -#: vgscan.c:56 +#: vgscan.c:57 msgid "Reading all physical volumes. This may take a while..." msgstr "" @@ -6810,40 +6256,40 @@ msgid "Physical volume %s not in volume group %s" msgstr "" -#: vgsplit.c:87 +#: vgsplit.c:71 #, c-format msgid "Logical Volume %s split between Volume Groups" msgstr "" -#: vgsplit.c:104 +#: vgsplit.c:88 #, c-format msgid "Physical Volume %s not found" msgstr "" -#: vgsplit.c:149 +#: vgsplit.c:135 #, c-format msgid "Snapshot %s split" msgstr "" -#: vgsplit.c:173 +#: vgsplit.c:157 msgid "Existing VG, new VG and physical volumes required." msgstr "" -#: vgsplit.c:221 +#: vgsplit.c:205 #, c-format msgid "Volume group \"%s\" already exists" msgstr "" -#: vgsplit.c:269 +#: vgsplit.c:247 msgid "Writing out updated volume groups" msgstr "" -#: vgsplit.c:291 +#: vgsplit.c:269 #, c-format msgid "Volume group \"%s\" became inconsistent: please fix manually" msgstr "" -#: vgsplit.c:306 +#: vgsplit.c:284 #, c-format msgid "Volume group \"%s\" successfully split from \"%s\"" msgstr "" --- lvm2-2.01.15.orig/tools/fsadm/Makefile.in +++ lvm2-2.01.15/tools/fsadm/Makefile.in @@ -26,6 +26,6 @@ $(CC) -o $@ $(OBJECTS) -rdynamic install: fsadm - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) fsadm \ $(sbindir)/fsadm --- lvm2-2.01.15.orig/tools/fsadm/Makefile +++ lvm2-2.01.15/tools/fsadm/Makefile @@ -0,0 +1,31 @@ +# +# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. +# Copyright (C) 2004 Red Hat, Inc. All rights reserved. +# +# This file is part of the LVM2. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +srcdir = . +top_srcdir = ../.. + + +SOURCES = fsadm.c + +TARGETS = fsadm + +include $(top_srcdir)/make.tmpl + +fsadm: $(OBJECTS) + $(CC) -o $@ $(OBJECTS) -rdynamic + +install: fsadm + $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm \ + $(sbindir)/fsadm + --- lvm2-2.01.15.orig/tools/Makefile.in +++ lvm2-2.01.15/tools/Makefile.in @@ -20,7 +20,7 @@ SUBDIRS += fsadm endif -SOURCES =\ +lib_SOURCES =\ dumpconfig.c \ formats.c \ lvchange.c \ @@ -64,6 +64,12 @@ vgscan.c \ vgsplit.c +tool_SOURCES = lvm.c + +lib_OBJECTS = $(lib_SOURCES:%.c=%.o) + +SOURCES = $(lib_SOURCES) $(tool_SOURCES) + TARGETS =\ .commands \ lvm @@ -94,14 +100,14 @@ include $(top_srcdir)/make.tmpl -lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a - $(CC) -o $@ $(OBJECTS) lvm.o $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic +lvm: $(OBJECTS) $(top_srcdir)/lib/liblvm.a + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic -lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a - $(CC) -o $@ $(OBJECTS) lvm-static.o -static $(LDFLAGS) $(LVMLIBS) \ - $(LIBS) -rdynamic +lvm.static: $(OBJECTS) $(top_srcdir)/lib/liblvm.a + $(CC) -o $@ $(OBJECTS) -static $(LDFLAGS) $(LVMLIBS) $(LIBS) \ + -rdynamic -liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) +liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(lib_OBJECTS) cat $(top_srcdir)/lib/liblvm.a > $@ $(AR) rs $@ $(OBJECTS) @@ -117,21 +123,21 @@ install_tools_dynamic install_tools_static install_cmdlib_dynamic: liblvm2cmd.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) liblvm2cmd.so \ $(libdir)/liblvm2cmd.so.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 644 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_cmdlib_static: liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) liblvm2cmd.a \ $(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) -D $(OWNER) $(GROUP) -m 644 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) lvm \ $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ @@ -142,7 +148,7 @@ ) install_tools_static: lvm.static - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ + $(INSTALL) -D $(OWNER) $(GROUP) $(STRIP) lvm.static \ $(staticdir)/lvm.static install: $(INSTALL_TARGETS) --- lvm2-2.01.15.orig/tools/commands.h +++ lvm2-2.01.15/tools/commands.h @@ -485,21 +485,6 @@ force_ARG, test_ARG, yes_ARG) -xx(pvresize, - "Resize a physical volume in use by a volume group", - "Not implemented. Use pvcreate options.", -/*** - "pvresize " - "[-A|--autobackup {y|n}] " - "[-d|--debug] " - "[-h|-?|--help]\n\t" - "[-s|--size PhysicalVolumeSize[kKmMgGtT]" "\n" - "[-v|--verbose] " - "[--version]\n\t" - "\tPhysicalVolumePath [PhysicalVolumePath...]\n", -***/ - autobackup_ARG, physicalvolumesize_ARG) - xx(pvs, "Display information about physical volumes", "pvs" "\n" --- lvm2-2.01.15.orig/debian/clvm.init +++ lvm2-2.01.15/debian/clvm.init @@ -0,0 +1,60 @@ +#! /bin/sh + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/sbin/clvmd +NAME=clvmd +DESC="Cluster LVM Daemon" + +test -x $DAEMON || exit 0 + +if [ -f /etc/default/clvm ] ; then + . /etc/default/clvm +fi + +[ -n "$CLVMDTIMEOUT" ] || CLVMDTIMEOUT=60 + +set -e + +wait_for_nodes() { + vgscan > /dev/null 2>&1 + wait=0 + while [ -n "$(vgchange -a y 2>&1 |grep "clvmd not running")" ]; do + if [ $wait -lt $CLVMDTIMEOUT ]; then + echo "clvmd: Waiting for other nodes to join the cluster.." + sleep 3 + wait=$(($wait + 3)) + else + echo "failed." + exit 1 + fi + done + echo "done." + exit 0 +} + +case "$1" in + start) + echo -n "Starting $DESC " + start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS + wait_for_nodes + ;; + stop) + echo -n "Stopping $DESC " + start-stop-daemon --stop --quiet --exec $DAEMON + echo "done." + ;; + reload|restart|force-reload) + echo -n "Restarting $DESC " + start-stop-daemon --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS + wait_for_nodes + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- lvm2-2.01.15.orig/debian/changelog +++ lvm2-2.01.15/debian/changelog @@ -0,0 +1,438 @@ +lvm2 (2.01.15-0ubuntu4) dapper; urgency=low + + * Call vgscan instead of pvscan in clvm init script. + + * Fix while condition in clvm init script to catch only cluster errors. + + -- Fabio M. Di Nitto Fri, 07 Apr 2006 06:53:52 +0200 + +lvm2 (2.01.15-0ubuntu3) dapper; urgency=low + + * Call pvscan in clvm init script after clvmd is running + to refresh the cache or vgchange might fail. + + * Add wait_for_nodes loop to avoid a possible race condition + when starting up the entire cluster all together to clvm init script. + + * Make clvm init script use /etc/default/clvm instead of /etc/default/clvmd. + + * Ship a default clvm. + + -- Fabio M. Di Nitto Thu, 06 Apr 2006 07:32:53 +0200 + +lvm2 (2.01.15-0ubuntu2) dapper; urgency=low + + * Add init script for clvmd. + + * clvm now Depends: cman | gulm and fence. + + * Build clvm with gulm support. + + * Add Build-Deps: libccs-dev and libgulm-dev. + + -- Fabio M. Di Nitto Wed, 05 Apr 2006 12:52:08 +0200 + +lvm2 (2.01.15-0ubuntu1) dapper; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 23 Jan 2006 09:58:28 +0100 + +lvm2 (2.01.14-3ubuntu2) dapper; urgency=low + + * Drop selinux support since it breaks lvm2-udeb. + * Make sure to build with a proper libdevmapper. + + -- Fabio M. Di Nitto Tue, 29 Nov 2005 09:11:39 +0100 + +lvm2 (2.01.14-3ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Fabio M. Di Nitto Fri, 25 Nov 2005 12:51:58 +0100 + +lvm2 (2.01.14-3) unstable; urgency=low + + * It is pronounced readline, not ncurses. Fix build-deps. (closes: #330715) + + -- Bastian Blank Fri, 30 Sep 2005 13:14:25 +0200 + +lvm2 (2.01.14-2) unstable; urgency=low + + * Enable readline support for debs. (closes: #257406) + * Fix O_DIRECT disable for hppa. (closes: #330166) + + -- Bastian Blank Wed, 28 Sep 2005 19:12:53 +0200 + +lvm2 (2.01.14-1) unstable; urgency=low + + * New upstream version. (closes: #320454) + * Enable selinux support for debs. (closes: #315505) + * Change optimization for udebs. + + -- Bastian Blank Mon, 15 Aug 2005 18:33:41 +0200 + +lvm2 (2.01.12-2) unstable; urgency=low + + * Fix LVM1 metadata support. (closes: #315339) + + -- Bastian Blank Wed, 22 Jun 2005 18:49:36 +0200 + +lvm2 (2.01.12-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Mon, 20 Jun 2005 16:50:41 +0200 + +lvm2 (2.01.11-1) unstable; urgency=low + + * New upstream version. + * Reentregrate changes. + + -- Bastian Blank Sun, 19 Jun 2005 13:17:48 +0200 + +lvm2 (2.01.04-5ubuntu1) breezy; urgency=low + + * Bump Build-Deps on libncruses5-dev and libdlm-dev (1.x) + + -- Fabio M. Di Nitto Mon, 30 May 2005 11:05:56 +0200 + +lvm2 (2.01.04-5) unstable; urgency=low + + * Revert -4's rather widespread changes, except for the amd64 fix. + + -- Andres Salomon Thu, 28 Apr 2005 05:20:08 -0400 + +lvm2 (2.01.04-4) unstable; urgency=low + + * Don't longer use cdbs. + * Remove cruft. + * Workaround missing O_NOATIME on amd64. (closes: #298762) + + -- Bastian Blank Thu, 28 Apr 2005 09:58:00 +0200 + +lvm2 (2.01.04-3) unstable; urgency=high + + * Workaround missing O_NOATIME. (closes: #297010) + + -- Bastian Blank Tue, 08 Mar 2005 18:40:08 +0100 + +lvm2 (2.01.04-2) unstable; urgency=low + + * New maintainer. + * Always build clvmd and bump version of needed libdlm. + + -- Bastian Blank Sun, 27 Feb 2005 16:49:32 +0100 + +lvm2 (2.01.04-1) unstable; urgency=low + + * New upstream + Closes: #292984, 293174 + + -- Patrick Caulfield Thu, 17 Feb 2005 09:30:18 +0000 + +lvm2 (2.00.32-1) unstable; urgency=low + + * New upstream + Closes: #283290, 284990, 285225 + * Don't make /lib/lvm2 the default library directory as it causes initrd + troubles. + Closes: #287042 + + -- Patrick Caulfield Fri, 24 Dec 2004 12:27:05 +0000 + +lvm2 (2.00.31-1) unstable; urgency=low + + * New upstream. + + -- Patrick Caulfield Mon, 20 Dec 2004 13:27:43 +0000 + +lvm2 (2.00.29-1) unstable; urgency=low + + * New upstream + * Only build clvmd where a libdlm is available. + Doesn't exactly close #281433 but maybe reduces it to a wishlist bug. + + -- Patrick Caulfield Tue, 7 Dec 2004 10:54:43 +0000 + +lvm2 (2.00.25-1) unstable; urgency=low + + * New upstream + Closes: 272117 + * Remove useless "pvresize" command. + Closes: #278597 + * Add Brazilian debconf translation. + Closes: #278732 + * Remove "is not recommended for production use" from package description. + Closes: #278919 + * Add lvm2create_initrd to documentation directory. + + -- Patrick Caulfield Wed, 3 Nov 2004 09:37:56 +0000 + +lvm2 (2.00.24-2) unstable; urgency=low + + * Also provide "clvm" package for Cluster LVM daemon + Closes: #276651 + * Get rid of references to kernel-patch-device-mapper + Closes: #275881 + * Fix some Lintian warnings. + + -- Patrick Caulfield Sat, 16 Oct 2004 14:07:16 +0100 + +lvm2 (2.00.24-1) unstable; urgency=low + + * New upstream + Closes: #268562, #270111 + + -- Patrick Caulfield Mon, 20 Sep 2004 09:03:57 +0100 + +lvm2 (2.00.22-1) unstable; urgency=low + + * New upstream + This one really /does/ incorporate the swab stuff, sorry waldi. + * Include Japanese po-debconf + Closes: #270763 + + -- Patrick Caulfield Mon, 13 Sep 2004 09:12:07 +0100 + +lvm2 (2.00.21-2) unstable; urgency=low + + * Disable use of O_DIRECT on arm. + Closes: #267157 + + -- Patrick Caulfield Mon, 23 Aug 2004 08:39:43 +0100 + +lvm2 (2.00.21-1) unstable; urgency=low + + * New upstream. + * Update README.Debian to mention that later Debian 2.4 kernels have + device-mapper included. + * Really add French debconf transation (sorry) + Closes: #260700 + * Add Czech debconf translation + Closes: #265545 + + -- Patrick Caulfield Fri, 20 Aug 2004 10:44:11 +0100 + +lvm2 (2.00.19-3) unstable; urgency=low + + * Use libc byteswap functions. + Closes: #259733 + * Add French debconfg translation + Closes: #260700 + + -- Patrick Caulfield Mon, 2 Aug 2004 11:37:15 +0100 + +lvm2 (2.00.19-2) unstable; urgency=low + + * Switch to debconf-gettext templates + Closes: #257681 + * Fix snapshot warning so it doesn't error on a new installation. + Closes: #256276 + + -- Patrick Caulfield Wed, 7 Jul 2004 15:31:33 +0100 + +lvm2 (2.00.19-1) unstable; urgency=low + + * New upstream(s) + * Also added patch from upstream bk to fix problem with large 2.6 device + numbers. Closes: #248477 + + -- Patrick Caulfield Thu, 1 Jul 2004 16:07:58 +0100 + +lvm2 (2.00.16-2) unstable; urgency=low + + * Switch md_component_detection OFF by default in config file. + Closes: #248709, #252085 + * Ignore cdroms by default in config file. + * Warn about snapshot incompatibility with lvm10. + + -- Patrick Caulfield Fri, 11 Jun 2004 08:43:15 +0100 + +lvm2 (2.00.16-1) unstable; urgency=low + + * New Upstream version + + -- Patrick Caulfield Sun, 30 May 2004 10:40:04 +0100 + +lvm2 (2.00.15-3) unstable; urgency=low + + * Take over maintainership + * Disable O_DIRECT on hppa. + + -- Patrick Caulfield Wed, 19 May 2004 09:05:29 +0100 + +lvm2 (2.00.15-2) unstable; urgency=low + + * Fix FTBFS (closes: #248143). + + -- Andres Salomon Sun, 09 May 2004 13:57:07 -0400 + +lvm2 (2.00.15-1) unstable; urgency=low + + * New upstream release. + * Drop 001-separated.patch; merged upstream. + * Drop 002-vgdisplay_colon.patch; merged upstream. + * Compile w/ -D_FILE_OFFSET_BITS=64 (thanks to Thierry DE CARVALHO for + the suggestion/patch). + * Add 004-make_clean.patch and 005-make_distclean.patch; fixes + build system problem. + * Add Patrick Caulfield as a co-maintainer. + * Disable O_DIRECT for mips and mipsel (closes: #247896). + + -- Andres Salomon Mon, 03 May 2004 00:54:06 -0400 + +lvm2 (2.00.08-4) unstable; urgency=low + + * Fix libdevmapper-dev versioned dep (missing epoch). + * Fix typos in manpage. (Closes: #226026) + * Implement vgdisplay --colon. (Closes: #226056) + * Add udeb for debian-installer. (Closes: #225178) + * Remove lvm-default symlink in prerm. (Closes: #230543) + + -- Andres Salomon Sun, 04 Jan 2004 23:14:25 -0500 + +lvm2 (2.00.08-3) unstable; urgency=low + + * Add autotools-dev build-dep. + + -- Andres Salomon Sun, 14 Dec 2003 20:37:39 -0500 + +lvm2 (2.00.08-2) unstable; urgency=low + + * Update build-deps to require devmapper 1.00.07 or greater. + + -- Andres Salomon Sat, 06 Dec 2003 23:07:59 -0500 + +lvm2 (2.00.08-1) unstable; urgency=low + + * New upstream release. + * Update package description. (Closes: #216441) + * Tell cdbs where to find config.{sub,guess}. (Closes: #217457) + + -- Andres Salomon Sun, 30 Nov 2003 02:07:38 -0500 + +lvm2 (2.00.07-1) unstable; urgency=low + + * New upstream release. + * Update standards-version. + * Convert build system to cdbs. + + -- Andres Salomon Wed, 15 Oct 2003 01:27:48 -0400 + +lvm2 (2.00.06-1) unstable; urgency=low + + * New upstream release. + + -- Andres Salomon Fri, 22 Aug 2003 00:59:39 -0400 + +lvm2 (2.00.05-1) unstable; urgency=low + + * New upstream release. (Closes: #203571) + * This release creates locking_dir if it doesn't exist. (Closes: #192789) + * Fixes missing-symlink bug. (Closes: #204432) + + -- Andres Salomon Tue, 12 Aug 2003 00:00:41 -0400 + +lvm2 (1.95.15-4) unstable; urgency=low + + * Update libdevmapper-dev build-deps, so accidents like rebuilding + against non-existent libdevmapper0 versions don't happen. + + -- Andres Salomon Thu, 07 Aug 2003 17:01:52 -0400 + +lvm2 (1.95.15-3) unstable; urgency=low + + * The naming-releases-is-lame release. + * Put binaries in /lib/lvm-200 instead of /sbin, allowing lvm10 to be + installed with lvm2. Also dropped init script. (Closes: #185245) + * Clean up manpages/undocumented files. + + -- Andres Salomon Thu, 07 Aug 2003 01:04:59 -0400 + +lvm2 (1.95.15-2) unstable; urgency=low + + * Calm-before-the-storm release; the next one will either be 2.00 (once + the kill-yer-VGs bug is fixed) or 1.95 with lvm10 compatibility (once + patrick returns from vacation). + * Update maintainer email address. + * Update standards-version. + * Rebuild against newly SONAME'd libdevmapper packages. (Closes: #199399) + * When deactivating VGs, ignore failures related to file locking, as + / might be read-only. (Closes: #192802) + * Make backup of lvm2 metadata in postinst. (Closes: #189325) + + -- Andres Salomon Thu, 31 Jul 2003 01:36:44 -0400 + +lvm2 (1.95.11-1) unstable; urgency=low + + * New upstream release. (Closes: #171436) + * Removed TODO and INTRO from debian/docs; added WHATS_NEW. + * Remove vgcfgrestore.8 undocumented symlink. + * Added a README.Debian, mentioning the device-mapper kernel module + requirement that lvm2 has. (Closes: #171674, #163020) + * Get rid of debian/conffiles (debhelper's smart enough to figure that out). + * debian/copyright fix to appease lintian. + * Fix typo in tools/commands.h that caused /usr/sbin/; to be created. + + -- Andres Salomon Mon, 9 Dec 2002 02:51:02 -0400 + +lvm2 (1.95.10-2) unstable; urgency=low + + * Fix software raid problems by ensuring lvm init script runs after + raidtools init script. (Closes: #152569) + + -- Andres Salomon Tue, 3 Sep 2002 04:05:43 -0400 + +lvm2 (1.95.10-1) unstable; urgency=low + + * New upstream release (Beta 3.2). + * Change all references to /dev/device-mapper/control to + /dev/mapper/control. + + -- Andres Salomon Sun, 1 Sep 2002 18:55:12 -0400 + +lvm2 (0.95.05-3) unstable; urgency=low + + * Get rid of awk dependency in init script. (Closes: #146257) + + -- Andres Salomon Sun, 12 May 2002 04:39:06 -0500 + +lvm2 (0.95.05-2) unstable; urgency=low + + * Use ${shlibs:Depends} in Depends. + * Get rid of postinst/postrm scripts, use debhelper's init script instead. + * Add Conflicts against lvm10, lvm-common. + * Fix endian issues on big-endian machines. + + -- Andres Salomon Thu, 2 May 2002 23:53:53 -0500 + +lvm2 (0.95.05-1) unstable; urgency=low + + * New release (Beta2). + + -- Andres Salomon Thu, 25 Apr 2002 00:37:41 -0500 + +lvm2 (0.95.04cvs20020306-1) unstable; urgency=low + + * CVS updated. + * Convert from debian native package. + + -- Andres Salomon Wed, 6 Mar 2002 00:43:21 -0500 + +lvm2 (0.95.04cvs20020304) unstable; urgency=low + + * CVS updated. + * Enhance init script; create devmapper control device, etc. + * Add dmsetup as a suggestion. + * Add /etc/lvm/lvm.conf conffile. + * Add undocumented(7) for the commands missing manpages. + + -- Andres Salomon Mon, 4 Mar 2002 04:51:26 -0500 + +lvm2 (0.95.02cvs20020220) unstable; urgency=low + + * Initial Release. + + -- Andres Salomon Wed, 20 Feb 2002 03:17:25 -0500 + --- lvm2-2.01.15.orig/debian/control +++ lvm2-2.01.15/debian/control @@ -0,0 +1,46 @@ +Source: lvm2 +Section: admin +Priority: optional +Maintainer: Debian LVM Team +Uploaders: Bastian Blank , Andres Salomon +Build-Depends: debhelper (>> 4.1.16), libdevmapper-dev (>= 2:1.01.05-1ubuntu2), autotools-dev, libdlm-dev (>= 1.20050527-0ubuntu1), libgulm-dev, libccs-dev, libreadline5-dev +Standards-Version: 3.6.2 + +Package: lvm2 +Architecture: any +Pre-Depends: debconf (>= 0.2.17) | debconf-2.0 +Depends: ${shlibs:Depends}, lvm-common (>> 1.5.8) +Provides: lvm-binaries +Suggests: dmsetup +Description: The Linux Logical Volume Manager + This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM + supports enterprise level volume management of disk and disk subsystems + by grouping arbitrary disks into volume groups. The total capacity of + volume groups can be allocated to logical volumes, which are accessed as + regular block devices. + . + LVM2 is backwards-compatible with LVM1 (lvm10), and requires Linux + kernel 2.4 or later + +Package: lvm2-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends} +Description: The Linux Logical Volume Manager + This is a udeb, or a microdeb, for the debian-installer. + . + This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM + supports enterprise level volume management of disk and disk subsystems + by grouping arbitrary disks into volume groups. The total capacity of + volume groups can be allocated to logical volumes, which are accessed as + regular block devices. + +Package: clvm +Section: admin +Architecture: any +Depends: ${shlibs:Depends}, lvm2 (>> 2.0.23), cman | gulm, fence +Description: Cluster LVM Daemon for lvm2 + This package provides the clustering interface for lvm2, when used with + Red Hat's "cman" cluster infrastructure. It allows logical volumes to + be created on shared storage devices (eg Fibre Channel, or iSCSI). --- lvm2-2.01.15.orig/debian/clvm.default +++ lvm2-2.01.15/debian/clvm.default @@ -0,0 +1,3 @@ +# Specify how many seconds the init script should wait +# for other nodes of the cluster to join before giving up. +# CLVMDTIMEOUT=60 --- lvm2-2.01.15.orig/debian/rules +++ lvm2-2.01.15/debian/rules @@ -0,0 +1,153 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + +CONFIGURE_FLAGS = \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --exec-prefix= \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-confdir=\$${exec_prefix}/etc + +ifneq (,$(findstring $(DEB_HOST_ARCH), arm hppa mips mipsel)) +CONFIGURE_FLAGS += --disable-o_direct +endif + +CFLAGS += -I$(CURDIR)/debian/include/$(DEB_HOST_ARCH) + +BUILD_DIR = debian/build + +PACKAGES_DEB = lvm2 clvm +PACKAGES_UDEB = lvm2-udeb + +$(BUILD_DIR)/build-deb/config.status: DIR = $(BUILD_DIR)/build-deb +$(BUILD_DIR)/build-deb/config.status: + dh_testdir + + rm -rf $(DIR) + mkdir -p $(DIR) + cp -al $(filter-out debian, $(wildcard *)) $(DIR) + cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf + cd $(DIR); \ + ./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \ + --with-cluster=shared \ + --with-clvmd=all \ + --enable-readline \ + --disable-selinux + +$(BUILD_DIR)/build-udeb/config.status: DIR = $(BUILD_DIR)/build-udeb +$(BUILD_DIR)/build-udeb/config.status: + dh_testdir + + rm -rf $(DIR) + mkdir -p $(DIR) + cp -al $(filter-out debian, $(wildcard *)) $(DIR) + cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf + cd $(DIR); \ + ./configure CFLAGS="$(CFLAGS)" $(CONFIGURE_FLAGS) \ + --with-optimisation="-Os" \ + --with-cluster=none \ + --with-pool=none \ + --disable-selinux + +build: build-deb build-udeb + +build-deb: $(BUILD_DIR)/build-deb-stamp +$(BUILD_DIR)/build-deb-stamp: DIR = $(BUILD_DIR)/build-deb +$(BUILD_DIR)/build-deb-stamp: $(BUILD_DIR)/build-deb/config.status + dh_testdir + + $(MAKE) -C $(DIR) + + touch $@ + +build-udeb: $(BUILD_DIR)/build-udeb-stamp +$(BUILD_DIR)/build-udeb-stamp: DIR = $(BUILD_DIR)/build-udeb +$(BUILD_DIR)/build-udeb-stamp: $(BUILD_DIR)/build-udeb/config.status + dh_testdir + + $(MAKE) -C $(DIR) + + touch $@ + +clean: + dh_testdir + rm -rf $(BUILD_DIR) + + dh_clean + +install: install-deb install-udeb + +install-deb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB)) +install-deb: DIR = $(BUILD_DIR)/build-deb +install-deb: INSTALL_DIR = $(BUILD_DIR)/install-deb +install-deb: build-deb + dh_testdir + dh_testroot + dh_clean -k $(DH_OPTIONS) + + rm -rf $(INSTALL_DIR) + $(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) + + dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR) + +install-udeb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB)) +install-udeb: DIR = $(BUILD_DIR)/build-udeb +install-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb +install-udeb: build-udeb + dh_testdir + dh_testroot + dh_clean -k $(DH_OPTIONS) + + rm -rf $(INSTALL_DIR) + $(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) + + dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR) + +# Build architecture-independent files here. +binary-indep: + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a +# dh_installdebconf -a + dh_installdocs -a + dh_installexamples -a +# dh_installmenu -a +# dh_installlogrotate -a +# dh_installemacsen -a +# dh_installpam -a +# dh_installmime -a + dh_installinit -p clvm --no-restart-on-upgrade -- start 65 S . start 3 0 6 . +# dh_installcron -a +# dh_installman -a +# dh_installinfo -a +# dh_undocumented -a + dh_installchangelogs WHATS_NEW -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -n + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- lvm2-2.01.15.orig/debian/compat +++ lvm2-2.01.15/debian/compat @@ -0,0 +1 @@ +4 --- lvm2-2.01.15.orig/debian/lvm2.README.Debian +++ lvm2-2.01.15/debian/lvm2.README.Debian @@ -0,0 +1,13 @@ +LVM2 requires the device-mapper kernel module (dm-mod). This is +available as a kernel patch for 2.4 (included as standard in +current Debian 2.4 kernels), and is distributed with linux 2.5 and above. + +The LVM1 kernel module (lvm-mod) will not work with lvm2 packages. +dm-mod and lvm-mod may both be loaded in the kernel at the same time with no +problems. Without dm-mod, this package is pretty useless. + +This doc directory contains a script called lvm2create_initrd. This is to help +people who want to run LVM2 as their root filesystem. It is not compatible +with the Debian initrds so you should only use this script if you really know +what you are doing. + --- lvm2-2.01.15.orig/debian/lvm2.install +++ lvm2-2.01.15/debian/lvm2.install @@ -0,0 +1,6 @@ +etc/lvm/lvm.conf +sbin/lv* sbin/pv* sbin/vg* lib/lvm-200/ +usr/share/man/man8/lv* +usr/share/man/man8/pv* +usr/share/man/man8/vg* +usr/share/man/man5 --- lvm2-2.01.15.orig/debian/lvm2.examples +++ lvm2-2.01.15/debian/lvm2.examples @@ -0,0 +1,4 @@ +doc/*.c +doc/*.conf +scripts/lvm2create_initrd/lvm2create_initrd +scripts/lvm2create_initrd/lvm2create_initrd.8 --- lvm2-2.01.15.orig/debian/lvm2-udeb.install +++ lvm2-2.01.15/debian/lvm2-udeb.install @@ -0,0 +1,4 @@ +etc/lvm/lvm.conf +sbin/lv* +sbin/pv* +sbin/vg* --- lvm2-2.01.15.orig/debian/clvm.README.Debian +++ lvm2-2.01.15/debian/clvm.README.Debian @@ -0,0 +1,32 @@ +This is the cluster LVM daemon for LVM2. + +In conjunction with the Red Hat cluster infrastructure (cman & dlm) it +will allow LVM volumes on shared storage to be managed from a central +point. If you also want to share data you should also look at GFS. + +Only "normal" block devices may be shared. At present, snapshots and +mirroring are not cluster aware. So, if you want to snapshot a volume +is is VERY IMPORTANT that not only the snapshot device but also the origin +device be activated on one node only. + +clvmd should be run on all nodes in the cluster, unless this is the case +commands will fail as the integrity of the LVM metadata cannot be assured. + +In order to make normal lvm2 cluster-aware it is necessary to edit the +configuration file /etc/lvm/lvm.conf as follows: + +in the global{} section: + locking_type = 2 + locking_library = "liblvm2clusterlock.so" + library_dir = "/lib/lvm2" + +The script clvmd_fix_conf.sh can be run to add these entries to your +configuration file. + +This package does not currently provide a startup script for clvmd - I will +add one when the cluster infrastruction and its packages stabilise a bit +more. + + +Patrick Caulfield +24th December 2004 --- lvm2-2.01.15.orig/debian/lvm2.postinst +++ lvm2-2.01.15/debian/lvm2.postinst @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + + +if test "$1" = "configure"; then + /usr/sbin/update-alternatives --install /lib/lvm-default lvm-default /lib/lvm-200 1 + + if test -x /usr/sbin/lvm-bin-scan; then + /usr/sbin/lvm-bin-scan + fi + + echo -n "Backing up any LVM2 metadata that may exist..." + /sbin/vgcfgbackup >/dev/null 2>&1 || true + echo "done." + + if test -f /etc/init.d/lvm2; then + update-rc.d -f lvm2 remove >/dev/null 2>&1 || true + fi +fi + +#DEBHELPER# --- lvm2-2.01.15.orig/debian/lvm2.preinst +++ lvm2-2.01.15/debian/lvm2.preinst @@ -0,0 +1,26 @@ +#!/bin/sh + +# Check for LVM1 snapshots + +if [ "`/sbin/lvmiopversion`" -le 10 ] +then + [ -x /sbin/lvscan ] && /sbin/lvscan 2>/dev/null | grep Snapshot 2>&1 > /dev/null + if [ "$?" = 0 ] + then + + . /usr/share/debconf/confmodule + + db_version 2.0 + db_capb backup + + db_title LVM2 + + db_input critical lvm2/snapshots || true + db_go + + db_stop + + fi +fi + +#DEBHELPER# --- lvm2-2.01.15.orig/debian/lvm2.prerm +++ lvm2-2.01.15/debian/lvm2.prerm @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if test "$1" = "remove"; then + + echo -n "Backing up any LVM2 metadata that may exist..." + /sbin/vgcfgbackup >/dev/null 2>&1 || true + echo "done." + + /usr/sbin/update-alternatives --remove lvm-default /lib/lvm-200 + +fi + +#DEBHELPER# --- lvm2-2.01.15.orig/debian/clvm.install +++ lvm2-2.01.15/debian/clvm.install @@ -0,0 +1,3 @@ +lib/liblvm2* lib/lvm2 +sbin/clvmd +usr/share/man/man8/clvmd* --- lvm2-2.01.15.orig/debian/lvm2.docs +++ lvm2-2.01.15/debian/lvm2.docs @@ -0,0 +1 @@ +doc/*.txt --- lvm2-2.01.15.orig/debian/copyright +++ lvm2-2.01.15/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Andres Salomon on +Wed, 20 Feb 2002 03:17:25 -0500. + +It was downloaded from http://www.sistina.com/products_lvm.htm + +Upstream Author: LVM Development Team + +Copyright (c) 2001-2002 LVM Development Team + +LVM2 is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +LVM2 is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the GPL can be found in +/usr/share/common-licenses/GPL --- lvm2-2.01.15.orig/debian/lvm2.templates +++ lvm2-2.01.15/debian/lvm2.templates @@ -0,0 +1,11 @@ +Template: lvm2/snapshots +Type: note +_Description: Snapshot format changes + The internal format of snapshots has changed between LVM1 and LVM2. Any + snapshots you have in LVM1 will be not be available to LVM2. + . + The installation procedure has detected that you have LVM1 snapshots on + your system. Before you complete the upgrade to LVM2 it is recommended + that you remove these snapshots and save their data if necessary. + . + All other LVM data will be preserved in the upgrade. --- lvm2-2.01.15.orig/debian/clvm.examples +++ lvm2-2.01.15/debian/clvm.examples @@ -0,0 +1 @@ +scripts/clvmd_fix_conf.sh --- lvm2-2.01.15.orig/debian/include/arm/bits/fcntl.h +++ lvm2-2.01.15/debian/include/arm/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/powerpc/bits/fcntl.h +++ lvm2-2.01.15/debian/include/powerpc/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/ia64/bits/fcntl.h +++ lvm2-2.01.15/debian/include/ia64/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/alpha/bits/fcntl.h +++ lvm2-2.01.15/debian/include/alpha/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 04000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/m68k/bits/fcntl.h +++ lvm2-2.01.15/debian/include/m68k/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/hppa/bits/fcntl.h +++ lvm2-2.01.15/debian/include/hppa/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 04000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/mips/bits/fcntl.h +++ lvm2-2.01.15/debian/include/mips/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 0x40000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/sparc/bits/fcntl.h +++ lvm2-2.01.15/debian/include/sparc/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 0x200000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/i386/bits/fcntl.h +++ lvm2-2.01.15/debian/include/i386/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/mipsel/bits/fcntl.h +++ lvm2-2.01.15/debian/include/mipsel/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 0x40000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/s390/bits/fcntl.h +++ lvm2-2.01.15/debian/include/s390/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/include/amd64/bits/fcntl.h +++ lvm2-2.01.15/debian/include/amd64/bits/fcntl.h @@ -0,0 +1,5 @@ +#include_next + +#ifdef __USE_GNU +# define O_NOATIME 01000000 /* Do not set atime. */ +#endif --- lvm2-2.01.15.orig/debian/po/templates.pot +++ lvm2-2.01.15/debian/po/templates.pot @@ -0,0 +1,54 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-07 12:10+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../lvm2.templates:3 +msgid "Snapshot format changes" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:3 +msgid "" +"The internal format of snapshots has changed between LVM1 and LVM2. Any " +"snapshots you have in LVM1 will be not be available to LVM2." +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:3 +msgid "" +"The installation procedure has detected that you have LVM1 snapshots on your " +"system. Before you complete the upgrade to LVM2 it is recommended that you " +"remove these snapshots and save their data if necessary." +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "" --- lvm2-2.01.15.orig/debian/po/cs.po +++ lvm2-2.01.15/debian/po/cs.po @@ -0,0 +1,58 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lvm2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-05 03:03-0700\n" +"PO-Revision-Date: 2004-08-13 17:39+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:3 +msgid "Snapshot format changes" +msgstr "Zmìna formátu snímkù" + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The internal format of snapshots has changed between LVM1 and LVM2. Any " +"snapshots you have in LVM1 will be not be available to LVM2." +msgstr "" +"Mezi LVM verze 1 a 2 se zmìnil vnitøní formát snímkù. Snímky vytvoøené v " +"LVM1 nebudou dostupné v LVM2." + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The installation procedure has detected that you have LVM1 snapshots on " +"your system. Before you complete the upgrade to LVM2 it is recommended " +"that you remove these snapshots and save their data if necessary." +msgstr "" +"Instalaèní procedura zjistila, ¾e máte ve svém systému snímky z LVM1. Ne¾ " +"dokonèíte pøechod na LVM2, doporuèujeme tyto snímky odstranit a jejich " +"pøípadná data zazálohovat." + +#. Type: note +#. Description +#: ../templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "V¹echna ostatní LVM data budou bìhem aktualizace zachována." --- lvm2-2.01.15.orig/debian/po/pt_BR.po +++ lvm2-2.01.15/debian/po/pt_BR.po @@ -0,0 +1,58 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lvm2\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n" +"POT-Creation-Date: 2004-07-05 03:03-0700\n" +"PO-Revision-Date: 2004-10-28 21:05-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:3 +msgid "Snapshot format changes" +msgstr "Mudanças no formato de snapshots" + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The internal format of snapshots has changed between LVM1 and LVM2. Any " +"snapshots you have in LVM1 will be not be available to LVM2." +msgstr "" +"O formato interno dos snapshots mudou entre o LVM1 e o LVM2. Quaisquer " +"snapshots que você possua em LVM1 não estarão disponíveis para o LVM2." + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The installation procedure has detected that you have LVM1 snapshots on " +"your system. Before you complete the upgrade to LVM2 it is recommended " +"that you remove these snapshots and save their data if necessary." +msgstr "" +"O procedimento de instalação detectou que você possui snapshots LVM1 em " +"seu sistema. Antes de completar a atualização para LVM2 é recomendado " +"que você remova esses snapshots e salve seus dados caso necessário." + +#. Type: note +#. Description +#: ../templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "Todos os outros dados do LVM serão preservados durante a atualização." --- lvm2-2.01.15.orig/debian/po/fr.po +++ lvm2-2.01.15/debian/po/fr.po @@ -0,0 +1,58 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: lvm2 2.00.19\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-07-05 03:03-0700\n" +"PO-Revision-Date: 2004-07-18 20:20+0200\n" +"Last-Translator: Jean-Luc Coulon (f5ibh) \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:3 +msgid "Snapshot format changes" +msgstr "Changement de format des clichés des volumes logiques (« snapshots »)" + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The internal format of snapshots has changed between LVM1 and LVM2. Any " +"snapshots you have in LVM1 will be not be available to LVM2." +msgstr "" +"Le format interne des snapshots a changé lors du passage de LVM1 à LVM2. Les " +"snapshots que vous avez créés avec LVM1 ne seront pas utilisables avec LVM2." + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The installation procedure has detected that you have LVM1 snapshots on " +"your system. Before you complete the upgrade to LVM2 it is recommended " +"that you remove these snapshots and save their data if necessary." +msgstr "" +"La procédure d'installation en cours a détecté que vous aviez des snapshots " +"de LVM1 sur votre ordinateur. Avant de terminer la mise à niveau vers LVM2 " +"il est recommandé de supprimer ces snapshots et, si nécessaire, de " +"sauvegarder leur contenu." + +#. Type: note +#. Description +#: ../templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "" +"Toutes les autres données du LVM seront préservées lors de la mise à niveau." --- lvm2-2.01.15.orig/debian/po/ja.po +++ lvm2-2.01.15/debian/po/ja.po @@ -0,0 +1,59 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: lvm2 2.00.21-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-09-09 13:49+0900\n" +"PO-Revision-Date: 2004-09-02 10:02+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:3 +msgid "Snapshot format changes" +msgstr "snapshot ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The internal format of snapshots has changed between LVM1 and LVM2. Any " +"snapshots you have in LVM1 will be not be available to LVM2." +msgstr "" +"LVM1 ¤È LVM2 ¤Î´Ö¤Ç snapshot ¤ÎÆâÉô¥Õ¥©¡¼¥Þ¥Ã¥È¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£LVM1 ¤Î " +"snapshot ¤Ï LVM2 ¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£" + +#. Type: note +#. Description +#: ../templates:3 +msgid "" +"The installation procedure has detected that you have LVM1 snapshots on " +"your system. Before you complete the upgrade to LVM2 it is recommended " +"that you remove these snapshots and save their data if necessary." +msgstr "" +"¥¤¥ó¥¹¥È¡¼¥ëºî¶ÈÃæ¤Ë LVM1 snapshot ¤¬¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£" +"LVM2 ¤Ë´°Á´¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëÁ°¤Ë¡¢¤³¤ì¤é¤Î snapshot ¤òºï½ü¤·¡¢É¬ÍפǤ¢¤ì¤Ð" +"¥Ç¡¼¥¿¤òÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£" + +#. Type: note +#. Description +#: ../templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "¾¤ÎÁ´¤Æ¤Î LVM ¥Ç¡¼¥¿¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î´Ö¤ËÊݸ¤µ¤ì¤Þ¤¹¡£" --- lvm2-2.01.15.orig/debian/po/POTFILES.in +++ lvm2-2.01.15/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] lvm2.templates