[gentoo-commits] gentoo-x86 commit in sys-fs/clvm/files: lvm2-stop.sh clvmd.rc lvm2-start.sh lvm.rc lvm.confd clvmd.confd clvmd.rc-2.02.33-xm lvm2-start.sh-2.02.33-xm cluster-locking-built-in.patch lvm2-stop.sh-2.02.33-xm lvm.confd-2.02.28-r2 lvm.rc-2.02.28-r2

[Christian Zoffoli (xmerlin)]

xmerlin     08/11/21 23:31:44

  Modified:             lvm2-stop.sh clvmd.rc lvm2-start.sh
  Added:                lvm.rc lvm.confd clvmd.confd
  Removed:              clvmd.rc-2.02.33-xm lvm2-start.sh-2.02.33-xm
                        cluster-locking-built-in.patch
                        lvm2-stop.sh-2.02.33-xm lvm.confd-2.02.28-r2
                        lvm.rc-2.02.28-r2
  Log:
  Version bump, removed a broken version, new init.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.4                  sys-fs/clvm/files/lvm2-stop.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh?r1=1.3&r2=1.4

Index: lvm2-stop.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lvm2-stop.sh	13 Jul 2006 08:23:55 -0000	1.3
+++ lvm2-stop.sh	21 Nov 2008 23:31:44 -0000	1.4
@@ -1,5 +1,5 @@
 # /lib/rcscripts/addons/lvm2-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh,v 1.3 2006/07/13 08:23:55 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-stop.sh,v 1.4 2008/11/21 23:31:44 xmerlin Exp $
 
 # Stop LVM2
 if [ -x /sbin/vgchange ] && \



1.5                  sys-fs/clvm/files/clvmd.rc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?r1=1.4&r2=1.5

Index: clvmd.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clvmd.rc	29 Mar 2008 15:42:28 -0000	1.4
+++ clvmd.rc	21 Nov 2008 23:31:44 -0000	1.5
@@ -1,18 +1,21 @@
 #!/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/clvm/files/clvmd.rc,v 1.4 2008/03/29 15:42:28 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.5 2008/11/21 23:31:44 xmerlin Exp $
+
+[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
+
+[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
 
-CLVM_BIN="/sbin/clvmd"
 VGCHANGE="/sbin/vgchange"
 VGSCAN="/sbin/vgscan"
 VGDISPLAY="/sbin/vgdisplay"
+CLVMD_PIDFILE="/var/run/clvmd.pid"
 
 depend() {
 	use dns logger
 	use net
 	need cman
-	before gfs
 }
 
 load_modules() {
@@ -67,54 +70,39 @@
 	fi
 }
 
-start() {
+start_volumes() {
+        ebegin "Scanning LVM volumes"
+        $VGSCAN &>/dev/null
 
-	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
+        ret=$?
 
-	if [ -z "${module}" ]; then
-		load_modules "dm-mod"
-		sleep 1s
-	fi
-
-	ebegin "Starting clvmd"
-	start-stop-daemon --start --quiet --exec ${CLVM_BIN}
-	eend $?
-
-	ebegin "Scanning LVM volumes"
-	${VGSCAN} &>/dev/null
-	eend $?
-	
-	#if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && [ -f /etc/lvmtab -o -d /etc/lvm ]
-	#then
-	#	ebegin "Setting up the Logical Volume Manager"
-	#	/sbin/vgchange -aly >/dev/null
-	#	eend $? "Failed to setup the LVM"
-	#fi
-
-	if [ -n "$LVM_VGS" ]
+	if [ "$ret" -eq 5 ]
 	then
-		for vg in $LVM_VGS
-		do
-			ebegin "  Activating VG: ${vg} "
-                        $VGCHANGE -ayl ${vg} >/dev/null
-                        eend $?
-		done
+		einfo "  ...initialization delayed."
+		eend 0
 	else
-		clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
-		for vg in $clustervgs; do
-			ebegin "  Activating Clustered VG: ${vg} "
-			$VGCHANGE -ayl ${vg} >/dev/null
-			eend $?
-		done
+		eend 0
+
+		if [ -n "$LVM_VGS" ]
+		then
+			for vg in $LVM_VGS
+			do
+				ebegin "  Activating VG: ${vg} "
+				$VGCHANGE -ayl ${vg} >/dev/null
+				eend $?
+			done
+		else
+			clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
+			for vg in $clustervgs; do
+				ebegin "  Activating Clustered VG: ${vg} "
+				$VGCHANGE -ayl ${vg} >/dev/null
+				eend $?
+			done
+		fi
 	fi
 }
 
-stop() {
-	# umount GFS filesystems
-	umount_gfs_filesystems
-
-	sleep 2	
-
+stop_volumes() {
 	if [ -n "$LVM_VGS" ]
 	then
 		for vg in $LVM_VGS
@@ -132,10 +120,40 @@
 			eend $?
 		done
 	fi
+}
+
+
+start() {
+	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
+
+	if [ -z "${module}" ]; then
+		load_modules "dm-mod"
+		sleep 1s
+	fi
+
+	ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
+
+	start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
+	eend $?
+
+	#start_volumes
+}
+
+stop() {
+
+	# umount GFS filesystems
+	umount_gfs_filesystems
+
+	#stop_volumes
 
 	ebegin "Stopping clvmd"
-	#start-stop-daemon --stop -s 9 --quiet --exec ${CLVM_BIN} --name clvmd
-	killall -TERM ${CLVM_BIN} >/dev/null
+	#start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
+	killall -TERM ${CLVMD_BIN} >/dev/null
 	eend $?
 
+        #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
+
+	#if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
+        #        unload_modules "dm-mod"
+        #fi
 }



1.4                  sys-fs/clvm/files/lvm2-start.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh?r1=1.3&r2=1.4

Index: lvm2-start.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lvm2-start.sh	13 Jul 2006 08:23:55 -0000	1.3
+++ lvm2-start.sh	21 Nov 2008 23:31:44 -0000	1.4
@@ -1,5 +1,5 @@
 # /lib/rcscripts/addons/lvm2-start.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh,v 1.3 2006/07/13 08:23:55 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm2-start.sh,v 1.4 2008/11/21 23:31:44 xmerlin Exp $
 
 # LVM support for /usr, /home, /opt ....
 # This should be done *before* checking local
@@ -21,7 +21,11 @@
 		if [[ $? == 0 ]] && [[ -x /sbin/vgchange ]] && \
 		   [[ -f /etc/lvmtab || -d /etc/lvm ]]
 		then
-			/sbin/vgchange --ignorelockingfailure -a y >/dev/null
+			noclustervgs=`/sbin/vgdisplay 2> /dev/null | \
+				awk 'BEGIN {RS="VG Name"} {if (!/Clustered/) { if ($1 != "---") print $1; } }'`
+			for vg in $noclustervgs; do
+				/sbin/vgchange --ignorelockingfailure -a y ${vg} >/dev/null
+			done
 		fi
 		eend $? "Failed to setup the LVM"
 	fi



1.1                  sys-fs/clvm/files/lvm.rc

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

Index: lvm.rc
===================================================================
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/lvm.rc,v 1.1 2008/11/21 23:31:44 xmerlin Exp $

depend() {
	if [ -e /lib/librc.so ]; then
		# on baselayout-1 this causes
		# dependency-cycles with checkroot (before *)
		before checkfs fsck
		after modules
	fi
}

start() {
	if [ ! -e /lib/librc.so ]; then
		eerror "The $SVCNAME init-script is written for baselayout-2!"
		eerror "Please do not use it with baselayout-1!".
		return 1
	fi

	start_addon lvm
}

stop() {
	stop_addon lvm
}

# vim:ts=4



1.1                  sys-fs/clvm/files/lvm.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/lvm.confd?rev=1.1&content-type=text/plain

Index: lvm.confd
===================================================================
# LVM should normally only be started after mdraid is available
# this is because LVM physical volumes are very often MD devices.
RC_AFTER="mdraid"

# vim: ft=gentoo-conf-d



1.1                  sys-fs/clvm/files/clvmd.confd

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

Index: clvmd.confd
===================================================================
# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.

CLVMD_CLUSTER_TIMEOUT=30