public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm.conf-2.02.28-r3.patch digest-lvm2-2.02.28-r3 clvmd.rc-2.02.28-r3
@ 2007-11-16  8:05 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; only message in thread
From: Robin H. Johnson (robbat2) @ 2007-11-16  8:05 UTC (permalink / raw
  To: gentoo-commits

robbat2     07/11/16 08:05:02

  Added:                lvm.conf-2.02.28-r3.patch digest-lvm2-2.02.28-r3
                        clvmd.rc-2.02.28-r3
  Log:
  Convert nolvmstatic and nolvm1 USE flags to static and lvm1 USE flags via the base profile package.use. Finish merging clvm support. Provide a slightly better than stock default configuration that is more suited to Gentoo, and ignores network-block devices by default for the livecd environment.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  sys-fs/lvm2/files/lvm.conf-2.02.28-r3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm.conf-2.02.28-r3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm.conf-2.02.28-r3.patch?rev=1.1&content-type=text/plain

Index: lvm.conf-2.02.28-r3.patch
===================================================================
diff -Nuar LVM2.2.02.28/doc/example.conf LVM2.2.02.28.new/doc/example.conf
--- LVM2.2.02.28/doc/example.conf	2007-04-26 09:44:57.000000000 -0700
+++ LVM2.2.02.28.new/doc/example.conf	2007-11-15 23:09:53.844322792 -0800
@@ -49,7 +49,9 @@
 
 
     # By default we accept every block device:
-    filter = [ "a/.*/" ]
+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
+    # noise when you probed while not available.
+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
 
     # Exclude the cdrom drive
     # filter = [ "r|/dev/cdrom|" ]
@@ -85,7 +87,7 @@
     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
     # the block devices it believes are valid.
     # 1 enables; 0 disables.
-    sysfs_scan = 1	
+    sysfs_scan = 1
 
     # By default, LVM2 will ignore devices used as components of
     # software RAID (md) devices by looking for md superblocks.
@@ -218,12 +220,14 @@
     # e.g. vgscan.lvm1 and they will stop working after you start using
     # the new lvm2 on-disk metadata format.
     # The default value is set when the tools are built.
-    # fallback_to_lvm1 = 0
+    # Gentoo: the LVM tools are a seperate package.
+    fallback_to_lvm1 = 0
 
     # The default metadata format that commands should use - "lvm1" or "lvm2".
     # The command line override is -M1 or -M2.
     # Defaults to "lvm1" if compiled in, else "lvm2".
-    # format = "lvm1"
+    # Gentoo: default to LVM2 format
+    format = "lvm2"
 
     # Location of proc filesystem
     proc = "/proc"
@@ -344,12 +348,12 @@
 
 # Metadata settings
 #
-# metadata {
+metadata {
     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
     # You might want to override it from the command line with 0 
     # when running pvcreate on new PVs which are to be added to large VGs.
-
-    # pvmetadatacopies = 1
+    # Gentoo: enabled for data safety
+    pvmetadatacopies = 2
 
     # Approximate default size of on-disk metadata areas in sectors.
     # You should increase this if you have large volume groups or
@@ -371,17 +375,17 @@
     # the supplied toolset to make changes (e.g. vgcfgrestore).
 
     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
-#}
+}
 
 # Event daemon
-#
-# dmeventd {
+# Gentoo: uncommented, since we provide the dmeventd init script
+dmeventd {
     # mirror_library is the library used when monitoring a mirror device.
     #
     # "libdevmapper-event-lvm2mirror.so" attempts to recover from failures.
     # It removes failed devices from a volume group and reconfigures a
     # mirror as necessary.
     #
-    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-#}
+    mirror_library = "libdevmapper-event-lvm2mirror.so"
+}
 



1.1                  sys-fs/lvm2/files/digest-lvm2-2.02.28-r3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/digest-lvm2-2.02.28-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/digest-lvm2-2.02.28-r3?rev=1.1&content-type=text/plain

Index: digest-lvm2-2.02.28-r3
===================================================================
MD5 940a882a71cae84f6befc8069a260ad1 LVM2.2.02.28.tgz 531905
RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 LVM2.2.02.28.tgz 531905
SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb LVM2.2.02.28.tgz 531905



1.1                  sys-fs/lvm2/files/clvmd.rc-2.02.28-r3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3?rev=1.1&content-type=text/plain

Index: clvmd.rc-2.02.28-r3
===================================================================
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3,v 1.1 2007/11/16 08:05:01 robbat2 Exp $

depend() {
	use dns logger
	use net
	need cluster-manager cluster-locking-manager fenced
}

exefile=/sbin/clvmd

umount_gfs_filesystems() {
	local sig retry
	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"

	if [ -n "${remaining}" ]
	then
	        sig=
	        retry=3
	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
	        do
	                if [ "${retry}" -lt 3 ]
			then
	                        ebegin "Unmounting GFS filesystems (retry)"
	                        umount ${remaining} &>/dev/null
	                        eend $? "Failed to unmount GFS filesystems this retry"
	                else
	                        ebegin "Unmounting GFS filesystems"
	                        umount ${remaining} &>/dev/null
	                        eend $? "Failed to unmount GFS filesystems"
	                fi
	                remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
	                [ -z "${remaining}" ] && break
	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
	                sleep 5
	                retry=$((${retry} -1))
	                sig=-9
	        done
	fi
}



start() {
	if [ -e /proc/modules -a ! -e /dev/device-mapper ] ; then
		ebegin "Loading device-mapper module"
		modprobe -q dm-mod
		eend $?
	fi
	if [ ! -e /dev/device-mapper ]; then
		eerror "device-mapper not available!"
		exit 1
	fi

	ebegin "Starting clvmd"
	start-stop-daemon --start --quiet --exec ${exefile}
	rc=$?
	eend $rc

	ebegin "Scanning LVM volumes"
	/sbin/vgscan &>/dev/null
	rc=$?
	eend $rc
	
	if [ "$rc" -eq 0 ] && [ -x /sbin/vgchange ] && [ -d /etc/lvm ]
	then
		ebegin "Setting up the Logical Volume Manager"
		/sbin/vgchange -aly >/dev/null
		eend $? "Failed to setup the LVM"
	fi
	
}

stop() {
	# umount GFS filesystems
	umount_gfs_filesystems

	# This sucks majorly. We need to find a way to only take out the CLUSTER
	# VGs and LVs, and never the local ones.
	einfo "Shutting down the Logical Volume Manager"

	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|awk '{print $3}'|sort|xargs echo`
	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|awk '{print $3}'|sort|xargs echo`
	for x in ${LOGICAL_VOLUMES}
	do
		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
		if [ "${LV_IS_ACTIVE}" = 0 ]
		then
			ebegin "  Shutting Down logical volume: ${x} "
			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
			eend $?
		fi
	done

	for x in ${VOLUME_GROUPS}
	do
		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|awk '{print $3}'|xargs echo`
		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
		then
			ebegin "  Shutting Down volume group: ${x} "
			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
			eend
		fi
	done

	for x in ${LOGICAL_VOLUMES}
	do
		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
		if [ "${LV_IS_ACTIVE}" = 1 ]
		then
			
			ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
			if [ ! ${ROOT_DEVICE} = ${x} ]
			then
				ewarn "  Unable to shutdown: ${x} "
			fi
		fi
	done
	einfo "Finished Shutting down the Logical Volume Manager"	

	ebegin "Stopping clvmd"
	start-stop-daemon --stop --quiet --exec ${exefile}
	eend $?
}



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-11-16  8:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-16  8:05 [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm.conf-2.02.28-r3.patch digest-lvm2-2.02.28-r3 clvmd.rc-2.02.28-r3 Robin H. Johnson (robbat2)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox