--- lvm2-2.02.02.orig/lib/locking/Makefile.in +++ lvm2-2.02.02/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.02.02.orig/lib/device/dev-md.c +++ lvm2-2.02.02/lib/device/dev-md.c @@ -53,8 +53,10 @@ sb_offset = MD_NEW_SIZE_SECTORS(size) << SECTOR_SHIFT; /* Check if it is an md component device. */ + /* Version 1 is little endian; version 0.90.0 is machine endian */ if (dev_read(dev, sb_offset, sizeof(uint32_t), &md_magic) && - (md_magic == xlate32(MD_SB_MAGIC))) { + ((md_magic == xlate32(MD_SB_MAGIC)) || + (md_magic == MD_SB_MAGIC))) { if (sb) *sb = sb_offset; ret = 1; --- lvm2-2.02.02.orig/lib/device/dev-io.c +++ lvm2-2.02.02/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.02.02.orig/lib/activate/activate.c +++ lvm2-2.02.02/lib/activate/activate.c @@ -778,6 +778,8 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, int exclusive, int filter) { + const struct config_node *cn; + struct config_value *cv; struct logical_volume *lv; struct lvinfo info; int r; @@ -808,6 +810,27 @@ if (exclusive) lv->status |= ACTIVATE_EXCL; + cn = find_config_node(cmd->cft->root, "activation/device_permissions"); + if (cn) { + cv = cn->v; + if (cv->type != CFG_INT) + return 1; + lv->uid = cv->v.i; + cv = cv->next; + if (cv->type != CFG_INT) + return 1; + lv->gid = cv->v.i; + cv = cv->next; + if (cv->type != CFG_INT) + return 1; + lv->mode = cv->v.i; + } + else { + lv->uid = 0; + lv->gid = 0; + lv->mode = 0600; + } + memlock_inc(); r = _lv_activate_lv(lv); memlock_dec(); --- lvm2-2.02.02.orig/lib/activate/dev_manager.c +++ lvm2-2.02.02/lib/activate/dev_manager.c @@ -858,9 +858,10 @@ * existing inactive table left behind. * Major/minor settings only apply to the visible layer. */ - if (!(dnode = dm_tree_add_new_dev(dtree, name, dlid, + if (!(dnode = _dm_tree_add_new_dev_mode(dtree, name, dlid, layer ? lv->major : 0, layer ? lv->minor : 0, + lv->uid, lv->gid, lv->mode, _read_only_lv(lv), lv->vg->status & PRECOMMITTED, lvlayer))) --- lvm2-2.02.02.orig/lib/metadata/metadata.h +++ lvm2-2.02.02/lib/metadata/metadata.h @@ -279,6 +279,9 @@ uint32_t read_ahead; int32_t major; int32_t minor; + uid_t uid; + gid_t gid; + mode_t mode; uint64_t size; uint32_t le_count; --- lvm2-2.02.02.orig/daemons/clvmd/clvmd.c +++ lvm2-2.02.02/daemons/clvmd/clvmd.c @@ -119,6 +119,7 @@ char *csid); static int process_reply(struct clvm_header *msg, int msglen, char *csid); static int open_local_sock(void); +static void close_local_sock(int local_socket); static struct local_client *find_client(int clientid); static void main_loop(int local_sock, int cmd_timeout); static void be_daemon(void); @@ -159,6 +160,23 @@ } +/* + * clvmd require dm-ioctl capability for operation + */ +static void check_permissions() +{ + if (getuid() || geteuid()) { + log_error("Cannot run as a non-root user."); + + /* + * Fail cleanly here if not run as root, instead of failing + * later when attempting a root-only operation + * Preferred exit code from an initscript for this. + */ + exit(4); + } +} + int main(int argc, char *argv[]) { int local_sock; @@ -207,6 +225,8 @@ } } + check_permissions(); + /* Fork into the background (unless requested not to) */ if (!debug) { be_daemon(); @@ -312,6 +332,8 @@ /* Do some work */ main_loop(local_sock, cmd_timeout); + close_local_sock(local_sock); + return 0; } @@ -638,7 +660,6 @@ closedown: clops->cluster_closedown(); - close(local_sock); } /* @@ -1729,19 +1750,30 @@ return 0; } +static void close_local_sock(int local_socket) +{ + if (local_socket != -1 && close(local_socket)) + stack; + + if (CLVMD_SOCKNAME[0] != '\0' && unlink(CLVMD_SOCKNAME)) + stack; +} + /* Open the local socket, that's the one we talk to libclvm down */ static int open_local_sock() { - int local_socket; + int local_socket = -1; struct sockaddr_un sockaddr; + mode_t old_mask; + + close_local_sock(local_socket); + old_mask = umask(0077); /* Open local socket */ - if (CLVMD_SOCKNAME[0] != '\0') - unlink(CLVMD_SOCKNAME); local_socket = socket(PF_UNIX, SOCK_STREAM, 0); if (local_socket < 0) { log_error("Can't create local socket: %m"); - return -1; + goto error; } /* Set Close-on-exec */ fcntl(local_socket, F_SETFD, 1); @@ -1751,18 +1783,19 @@ sockaddr.sun_family = AF_UNIX; if (bind(local_socket, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) { log_error("can't bind local socket: %m"); - close(local_socket); - return -1; + goto error; } if (listen(local_socket, 1) != 0) { log_error("listen local: %m"); - close(local_socket); - return -1; + goto error; } - if (CLVMD_SOCKNAME[0] != '\0') - chmod(CLVMD_SOCKNAME, 0600); + umask(old_mask); return local_socket; +error: + close_local_sock(local_socket); + umask(old_mask); + return -1; } void process_message(struct local_client *client, char *buf, int len, char *csid) --- lvm2-2.02.02.orig/daemons/clvmd/clvm.h +++ lvm2-2.02.02/daemons/clvmd/clvm.h @@ -45,9 +45,8 @@ #define CLVMD_FLAG_SYSTEMLV 2 /* Data in system LV under my node name */ #define CLVMD_FLAG_NODEERRS 4 /* Reply has errors in node-specific portion */ -/* Name of the local socket to communicate between libclvm and clvmd */ -//static const char CLVMD_SOCKNAME[]="/var/run/clvmd"; -static const char CLVMD_SOCKNAME[] = "\0clvmd"; +/* Name of the local socket to communicate between lvm and clvmd */ +static const char CLVMD_SOCKNAME[]= "/var/run/clvmd.sock"; /* Internal commands & replies */ #define CLVMD_CMD_REPLY 1 --- lvm2-2.02.02.orig/daemons/clvmd/Makefile.in +++ lvm2-2.02.02/daemons/clvmd/Makefile.in @@ -56,7 +56,7 @@ LVMLIBS = -llvm ifeq ("@DMEVENTD@", "yes") - LVMLIBS += -ldevmapper-event -lpthread + LVMLIBS += -ldevmapper-event endif ifeq ("@DEVMAPPER@", "yes") @@ -64,6 +64,7 @@ endif CFLAGS += -D_REENTRANT -fno-strict-aliasing +LDFLAGS += -lpthread include $(top_srcdir)/make.tmpl @@ -76,7 +77,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.02.02.orig/tools/Makefile.in +++ lvm2-2.02.02/tools/Makefile.in @@ -20,7 +20,7 @@ SUBDIRS += fsadm endif -SOURCES =\ +lib_SOURCES =\ dumpconfig.c \ formats.c \ lvchange.c \ @@ -65,6 +65,12 @@ vgscan.c \ vgsplit.c +tool_SOURCES = lvm.c + +lib_OBJECTS = $(lib_SOURCES:%.c=%.o) + +SOURCES = $(lib_SOURCES) $(tool_SOURCES) + TARGETS =\ .commands \ lvm @@ -99,14 +105,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) @@ -120,21 +126,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) @( \ @@ -145,7 +151,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.02.02.orig/tools/commands.h +++ lvm2-2.02.02/tools/commands.h @@ -500,21 +500,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.02.02.orig/tools/fsadm/Makefile.in +++ lvm2-2.02.02/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.02.02.orig/tools/fsadm/Makefile +++ lvm2-2.02.02/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.02.02.orig/debian/clvm.README.Debian +++ lvm2-2.02.02/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.02.02.orig/debian/clvm.install +++ lvm2-2.02.02/debian/clvm.install @@ -0,0 +1,3 @@ +lib/liblvm2* lib/lvm2 +sbin/clvmd +usr/share/man/man8/clvmd* --- lvm2-2.02.02.orig/debian/clvm.default +++ lvm2-2.02.02/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.02.02.orig/debian/rules +++ lvm2-2.02.02/debian/rules @@ -0,0 +1,156 @@ +#!/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 armeb 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 + + cp po/lvm2.po po/lvm2.pot + +$(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) + rm -f po/lvm2.pot + + 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-start --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.02.02.orig/debian/lvm2.README.Debian +++ lvm2-2.02.02/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.02.02.orig/debian/lvm2.docs +++ lvm2-2.02.02/debian/lvm2.docs @@ -0,0 +1 @@ +doc/*.txt --- lvm2-2.02.02.orig/debian/lvm2.install +++ lvm2-2.02.02/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.02.02.orig/debian/lvm2.prerm +++ lvm2-2.02.02/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.02.02.orig/debian/lvm2.preinst +++ lvm2-2.02.02/debian/lvm2.preinst @@ -0,0 +1,44 @@ +#! /bin/sh + +set -e + +case "$1" in + install|upgrade) + . /usr/share/debconf/confmodule + + db_version 2.0 + db_capb backup + + db_title LVM2 + + # Check for LVM1 snapshots + if [ "`/sbin/lvmiopversion`" -le 10 ] && [ -x /sbin/lvscan ] && /sbin/lvscan 2>/dev/null | grep Snapshot 2>&1 > /dev/null; then + db_input critical lvm2/snapshots || true + db_go + fi + + if ! dpkg --compare-versions $(uname -r) ge '2.6.12'; then + db_fset lvm2/kernel seen false + db_input critical lvm2/kernel || true + db_go + exit 1 + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- lvm2-2.02.02.orig/debian/clvm.examples +++ lvm2-2.02.02/debian/clvm.examples @@ -0,0 +1 @@ +scripts/clvmd_fix_conf.sh --- lvm2-2.02.02.orig/debian/NEWS +++ lvm2-2.02.02/debian/NEWS @@ -0,0 +1,11 @@ +lvm2 (2.02.01-3) unstable; urgency=low + + This release enables md_component_detection by default. If pvscan fails to + find a device which was part of a linux softraid, clear the superblock which + lives in the last 4k of the device. + + This release adds support to overwrite permissions for devices. This feature + is controlled by a device_permissions setting in the activation group in + /etc/lvm/lvm.conf. + + -- Bastian Blank Sun, 12 Feb 2006 11:54:09 +0100 --- lvm2-2.02.02.orig/debian/changelog +++ lvm2-2.02.02/debian/changelog @@ -0,0 +1,544 @@ +lvm2 (2.02.02-1ubuntu1.6) dapper-security; urgency=low + + * SECURITY UPDATE: unprivileged logical volume manipulation with clvmd + - daemons/clvmd/{clvm.h,clvmd.c}: revert to using a pathname-based + socket in order to enforce correct permissions. + - http://patch-tracker.debian.org/patch/series/view/lvm2/2.02.39-8/CVE-2010-2526.patch + - CVE-2010-2526 + + -- Marc Deslauriers Thu, 23 Sep 2010 14:48:20 -0400 + +lvm2 (2.02.02-1ubuntu1.5) dapper-updates; urgency=low + + * Backport endian fix for dev_is_md from upstream. + After a deeper investigation we found out that md super block 0.90.0 + are machine endian and super block 1 or higher are little endian. + On big endian machine (that are the only one affected) we need to compare + both values. + (Closes Ubuntu: 81598) + + Verification tests done by Fabio M. Di Nitto and Simon Law. + Bug acknoledged, fixed, tested by upstream. + + -- Fabio M. Di Nitto Mon, 12 Feb 2007 07:29:21 +0100 + +lvm2 (2.02.02-1ubuntu1.4) dapper-proposed; urgency=low + + * Backport endian fix for dev_is_md from upstream. + After a deeper investigation we found out that md super block 0.90.0 + are machine endian and super block 1 or higher are little endian. + On big endian machine (that are the only one affected) we need to compare + both values. + (Closes Ubuntu: 81598) + + -- Fabio M. Di Nitto Sun, 28 Jan 2007 05:58:35 +0100 + +lvm2 (2.02.02-1ubuntu1.3) dapper-proposed; urgency=low + + * Fix dev_is_md check on big endian machines. + (Closes Ubuntu: 81598) + + -- Fabio M. Di Nitto Fri, 26 Jan 2007 09:36:27 +0100 + +lvm2 (2.02.02-1ubuntu1.2) dapper-updates; urgency=low + + * Don't start clvmd on install. + (Closes Ubuntu: #56496) + + Verification tests done by Fabio M. Di Nitto and Simon Law. + + -- Fabio M. Di Nitto Thu, 30 Nov 2006 07:15:39 +0100 + +lvm2 (2.02.02-1ubuntu1.1) dapper-proposed; urgency=low + + * Don't start clvmd on install. + (Closes Ubuntu: #56496) + + -- Fabio M. Di Nitto Wed, 22 Nov 2006 21:15:40 +0100 + +lvm2 (2.02.02-1ubuntu1) dapper; urgency=low + + * merged with debian (required to fix ubuntu #38007) + * daemons/clvmd/Makefile.in: + * added -lpthreads to LDFLAGS to make it build + + -- Michael Vogt Mon, 8 May 2006 11:42:45 +0200 + +lvm2 (2.02.02-1) unstable; urgency=low + + * New upstream version. + * Enable md_component_detection. (closes: #278180) + * Set device permissions. + * Don't use O_DIRECT on armeb. (closes: #351632) + + -- Bastian Blank Sun, 12 Feb 2006 13:00:23 +0100 + +lvm2 (2.02.01-3) unstable; urgency=low + + * Fix snapshot check to work with set -e. (closes: #348154) + + -- Bastian Blank Sun, 15 Jan 2006 13:29:06 +0100 + +lvm2 (2.02.01-2) unstable; urgency=low + + * Abort installation on kernel < 2.6.12. + + -- Bastian Blank Sat, 14 Jan 2006 10:51:33 +0100 + +lvm2 (2.02.01-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Sat, 03 Dec 2005 18:15:24 +0100 + +lvm2 (2.02.00-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Sat, 26 Nov 2005 10:26:42 +0100 + +lvm2 (2.01.15-0ubuntu5) dapper; urgency=low + + * debian/rules: Copy lvm2.po to lvm2.pot at build, remove it at clean. + Closes: + + -- Martin Pitt Thu, 4 May 2006 12:53:41 +0200 + +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.02.02.orig/debian/compat +++ lvm2-2.02.02/debian/compat @@ -0,0 +1 @@ +4 --- lvm2-2.02.02.orig/debian/po/cs.po +++ lvm2-2.02.02/debian/po/cs.po @@ -0,0 +1,71 @@ +# +# 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: pkg-lvm-maintainers@lists.alioth.debian.org\n" +"POT-Creation-Date: 2006-02-12 12:56+0100\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 +#: ../lvm2.templates:3 +msgid "Snapshot format changes" +msgstr "Zmìna formátu snímkù" + +#. 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 "" +"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 +#: ../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 "" +"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 +#: ../lvm2.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." + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "Running kernel TOO old" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "" +"Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them." +msgstr "" --- lvm2-2.02.02.orig/debian/po/ja.po +++ lvm2-2.02.02/debian/po/ja.po @@ -0,0 +1,72 @@ +# +# 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: pkg-lvm-maintainers@lists.alioth.debian.org\n" +"POT-Creation-Date: 2006-02-12 12:56+0100\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 +#: ../lvm2.templates:3 +msgid "Snapshot format changes" +msgstr "snapshot ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" + +#. 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 "" +"LVM1 ¤È LVM2 ¤Î´Ö¤Ç snapshot ¤ÎÆâÉô¥Õ¥©¡¼¥Þ¥Ã¥È¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£LVM1 ¤Î " +"snapshot ¤Ï LVM2 ¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£" + +#. 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 "" +"¥¤¥ó¥¹¥È¡¼¥ëºî¶ÈÃæ¤Ë LVM1 snapshot ¤¬¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£" +"LVM2 ¤Ë´°Á´¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëÁ°¤Ë¡¢¤³¤ì¤é¤Î snapshot ¤òºï½ü¤·¡¢É¬ÍפǤ¢¤ì¤Ð" +"¥Ç¡¼¥¿¤òÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£" + +#. Type: note +#. Description +#: ../lvm2.templates:3 +msgid "All other LVM data will be preserved in the upgrade." +msgstr "¾¤ÎÁ´¤Æ¤Î LVM ¥Ç¡¼¥¿¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î´Ö¤ËÊݸ¤µ¤ì¤Þ¤¹¡£" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "Running kernel TOO old" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "" +"Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them." +msgstr "" --- lvm2-2.02.02.orig/debian/po/pt_BR.po +++ lvm2-2.02.02/debian/po/pt_BR.po @@ -0,0 +1,71 @@ +# +# 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: pkg-lvm-maintainers@lists.alioth.debian.org\n" +"POT-Creation-Date: 2006-02-12 12:56+0100\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 +#: ../lvm2.templates:3 +msgid "Snapshot format changes" +msgstr "Mudanças no formato de snapshots" + +#. 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 "" +"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 +#: ../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 "" +"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 +#: ../lvm2.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." + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "Running kernel TOO old" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "" +"Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them." +msgstr "" --- lvm2-2.02.02.orig/debian/po/fr.po +++ lvm2-2.02.02/debian/po/fr.po @@ -0,0 +1,71 @@ +# 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: pkg-lvm-maintainers@lists.alioth.debian.org\n" +"POT-Creation-Date: 2006-02-12 12:56+0100\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 +#: ../lvm2.templates:3 +msgid "Snapshot format changes" +msgstr "Changement de format des clichés des volumes logiques (« snapshots »)" + +#. 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 "" +"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 +#: ../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 "" +"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 +#: ../lvm2.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." + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "Running kernel TOO old" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "" +"Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them." +msgstr "" --- lvm2-2.02.02.orig/debian/po/templates.pot +++ lvm2-2.02.02/debian/po/templates.pot @@ -0,0 +1,59 @@ +# SOME DESCRIPTIVE TITLE. +# 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" +"Report-Msgid-Bugs-To: pkg-lvm-maintainers@lists.alioth.debian.org\n" +"POT-Creation-Date: 2006-02-12 12:56+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 "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "Running kernel TOO old" +msgstr "" + +#. Type: note +#. Description +#: ../lvm2.templates:15 +msgid "" +"Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them." +msgstr "" --- lvm2-2.02.02.orig/debian/po/POTFILES.in +++ lvm2-2.02.02/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] lvm2.templates --- lvm2-2.02.02.orig/debian/include/arm/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/s390/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/ia64/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/sparc/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/mipsel/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/alpha/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/hppa/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/m68k/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/mips/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/amd64/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/i386/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/include/powerpc/bits/fcntl.h +++ lvm2-2.02.02/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.02.02.orig/debian/copyright +++ lvm2-2.02.02/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.02.02.orig/debian/control +++ lvm2-2.02.02/debian/control @@ -0,0 +1,46 @@ +Source: lvm2 +Section: admin +Priority: optional +Maintainer: Debian LVM Team +Uploaders: Bastian Blank +Build-Depends: debhelper (>> 4.2), libdevmapper-dev (>> 2:1.02.03), autotools-dev, libdlm-dev (>= 1.20060222-0ubuntu4), libreadline5-dev, libgulm-dev, libccs-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.02.02.orig/debian/lvm2.templates +++ lvm2-2.02.02/debian/lvm2.templates @@ -0,0 +1,17 @@ +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. + +Template: lvm2/kernel +Type: note +_Description: Running kernel TOO old + Your running kernel is < 2.6.12. lvm2 since 2.02.00 does not work with them. + --- lvm2-2.02.02.orig/debian/lvm2.examples +++ lvm2-2.02.02/debian/lvm2.examples @@ -0,0 +1,4 @@ +doc/*.c +doc/*.conf +scripts/lvm2create_initrd/lvm2create_initrd +scripts/lvm2create_initrd/lvm2create_initrd.8 --- lvm2-2.02.02.orig/debian/lvm2.postinst +++ lvm2-2.02.02/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.02.02.orig/debian/lvm2-udeb.install +++ lvm2-2.02.02/debian/lvm2-udeb.install @@ -0,0 +1,4 @@ +etc/lvm/lvm.conf +sbin/lv* +sbin/pv* +sbin/vg* --- lvm2-2.02.02.orig/debian/clvm.init +++ lvm2-2.02.02/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.02.02.orig/make.tmpl.in +++ lvm2-2.02.02/make.tmpl.in @@ -56,7 +56,7 @@ SUFFIXES = .c .d .o .so .a .po .pot .mo .dylib -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 @@ -189,7 +189,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.02.02.orig/autoconf/config.guess +++ lvm2-2.02.02/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.02.02.orig/autoconf/config.sub +++ lvm2-2.02.02/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.02.02.orig/doc/example.conf +++ lvm2-2.02.02/doc/example.conf @@ -39,12 +39,11 @@ # the cache file gets regenerated (see below). # 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/.*/" ] @@ -222,7 +221,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 { @@ -251,6 +257,9 @@ # "@*" matches if any tag defined on the host is also set in the LV or VG # # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ] + + # Permissions to use for new devices + # device_permissions = [ 0, 6, 0640 ] }