LVM2 ./WHATS_NEW scripts/lvmdump.sh

LVM2 ./WHATS_NEW scripts/lvmdump.sh

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2012-04-18 15:26:02

Modified files:
	.              : WHATS_NEW 
	scripts        : lvmdump.sh 

Log message:
	Add udev info and context to lvmdump.
	--------------------------------------------------------------------

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2384&r2=1.2385
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/lvmdump.sh.diff?cvsroot=lvm2&r1=1.18&r2=1.19

--- LVM2/WHATS_NEW	2012/04/12 03:16:37	1.2384
+++ LVM2/WHATS_NEW	2012/04/18 15:26:02	1.2385
@@ -1,5 +1,6 @@
 Version 2.02.96 - 
 ================================
+  Add udev info and context to lvmdump.
   Fix RAID device replacement code so that it works under snapshot.
   Fix inability to split RAID1 image while specifying a particular PV.
   Update man pages to give them same look&feel.
--- LVM2/scripts/lvmdump.sh	2011/06/02 09:08:16	1.18
+++ LVM2/scripts/lvmdump.sh	2012/04/18 15:26:02	1.19
@@ -30,6 +30,7 @@
 CUT=cut
 DATE=date
 BASENAME=basename
+UDEVADM=udevadm
 UNAME=uname
 
 # user may override lvm and dmsetup location by setting LVM_BINARY
@@ -54,6 +55,7 @@
 	echo "    -m gather LVM metadata from the PVs"
 	echo "    -d <directory> dump into a directory instead of tarball"
 	echo "    -c if running clvmd, gather cluster data as well"
+	echo "    -u gather udev info and context"
 	echo ""
 
 	exit 1
@@ -62,7 +64,8 @@
 advanced=0
 clustered=0
 metadata=0
-while getopts :acd:hm opt; do
+udev=0
+while getopts :acd:hmu opt; do
 	case $opt in 
 		s)      sysreport=1 ;;
 		a)	advanced=1 ;;
@@ -70,6 +73,7 @@
 		d)	userdir=$OPTARG ;;
 		h)	usage ;;
 		m)	metadata=1 ;;
+		u)	udev=1 ;;
 		:)	echo "$0: $OPTARG requires a value:"; usage ;;
 		\?)     echo "$0: unknown option $OPTARG"; usage ;;
 		*)	usage ;;
@@ -221,6 +225,20 @@
 	done
 fi
 
+if (( $udev )); then
+	myecho "Gathering udev info..."
+
+	udev_dir="$dir/udev"
+
+	log "$MKDIR -p \"$udev_dir\""
+	log "$UDEVADM info --version >> \"$udev_dir/version\" 2>> \"$log\""
+	log "$UDEVADM info --export-db >> \"$udev_dir/db\" 2>> \"$log\""
+	log "$CP -a /etc/udev/udev.conf \"$udev_dir/conf\" 2>> \"$log\""
+	log "$LS -la /lib/udev >> \"$udev_dir/lib_dir\" 2>> \"$log\""
+	log "$CP -aR /etc/udev/rules.d \"$udev_dir/rules_etc\" 2>> \"$log\""
+	log "$CP -aR /lib/udev/rules.d \"$udev_dir/rules_lib\" 2>> \"$log\""
+fi
+
 if test -z "$userdir"; then
 	lvm_dump="$dirbase.tgz"
 	myecho "Creating report tarball in $HOME/$lvm_dump..."

LVM2 ./WHATS_NEW scripts/lvmdump.sh

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2011-06-02 09:02:03

Modified files:
	.              : WHATS_NEW 
	scripts        : lvmdump.sh 

Log message:
	Always use append to file in lvmdump (selinux policy - no file truncation).
	
	Workaround dmsetup ls --tree (terminal ioctl for width).
	(Until isatty() will be allowed by selinux policy.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2005&r2=1.2006
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/lvmdump.sh.diff?cvsroot=lvm2&r1=1.16&r2=1.17

--- LVM2/WHATS_NEW	2011/06/01 21:16:55	1.2005
+++ LVM2/WHATS_NEW	2011/06/02 09:02:03	1.2006
@@ -1,5 +1,6 @@
 Version 2.02.86 -  
 =================================
+  Always use append to file in lvmdump (selinux policy - no file truncation).
   Propagate test mode to clvmd to skip activation and changes to held locks.
   Defer writing PV labels to vg_write.
   Store label_sector only in struct physical_volume.
--- LVM2/scripts/lvmdump.sh	2011/02/01 21:39:15	1.16
+++ LVM2/scripts/lvmdump.sh	2011/06/02 09:02:03	1.17
@@ -55,7 +55,7 @@
 	echo "    -d <directory> dump into a directory instead of tarball"
 	echo "    -c if running clvmd, gather cluster data as well"
 	echo ""
-	
+
 	exit 1
 }
 
@@ -116,7 +116,7 @@
 	myecho "Gathering LVM volume info..."
 
 	myecho "  vgscan..."
-	log "\"$LVM\" vgscan -vvvv > \"$dir/vgscan\" 2>&1"
+	log "\"$LVM\" vgscan -vvvv >> \"$dir/vgscan\" 2>&1"
 
 	myecho "  pvscan..."
 	log "\"$LVM\" pvscan -v >> \"$dir/pvscan\" 2>> \"$log\""
@@ -125,10 +125,10 @@
 	log "\"$LVM\" lvs -a -o +devices >> \"$dir/lvs\" 2>> \"$log\""
 
 	myecho "  pvs..."
-	log "\"$LVM\" pvs -a -v > \"$dir/pvs\" 2>> \"$log\""
+	log "\"$LVM\" pvs -a -v >> \"$dir/pvs\" 2>> \"$log\""
 
 	myecho "  vgs..."
-	log "\"$LVM\" vgs -v > \"$dir/vgs\" 2>> \"$log\""
+	log "\"$LVM\" vgs -v >> \"$dir/vgs\" 2>> \"$log\""
 fi
 
 if (( $clustered )); then
@@ -146,7 +146,7 @@
 	echo "----------------------------------"
 	if [ -f /proc/cluster/dlm_locks ]
 	then
-		echo clvmd > /proc/cluster/dlm_locks
+		echo clvmd >> /proc/cluster/dlm_locks
 		cat /proc/cluster/dlm_locks
 		echo
 		echo "RESOURCE DIR:"
@@ -166,11 +166,11 @@
 		echo "MASTER:"
 		cat /debug/dlm/clvmd_master
 	fi
-	} > $dir/cluster_info
+	} >> $dir/cluster_info
 fi
 
 myecho "Gathering LVM & device-mapper version info..."
-echo "LVM VERSION:" > "$dir/versions"
+echo "LVM VERSION:" >> "$dir/versions"
 "$LVM" lvs --version >> "$dir/versions" 2>> "$log"
 echo "DEVICE MAPPER VERSION:" >> "$dir/versions"
 "$DMSETUP" --version >> "$dir/versions" 2>> "$log"
@@ -180,25 +180,27 @@
 "$DMSETUP" targets >> "$dir/versions" 2>> "$log"
 
 myecho "Gathering dmsetup info..."
-log "\"$DMSETUP\" info -c > \"$dir/dmsetup_info\" 2>> \"$log\""
-log "\"$DMSETUP\" table > \"$dir/dmsetup_table\" 2>> \"$log\""
-log "\"$DMSETUP\" status > \"$dir/dmsetup_status\" 2>> \"$log\""
-log "\"$DMSETUP\" ls --tree > \"$dir/dmsetup_ls_tree\" 2>> \"$log\""
+log "\"$DMSETUP\" info -c >> \"$dir/dmsetup_info\" 2>> \"$log\""
+log "\"$DMSETUP\" table >> \"$dir/dmsetup_table\" 2>> \"$log\""
+log "\"$DMSETUP\" status >> \"$dir/dmsetup_status\" 2>> \"$log\""
+
+# cat as workaround to avoid tty ioctl (selinux)
+log "\"$DMSETUP\" ls --tree 2>> \"$log\" | cat >> \"$dir/dmsetup_ls_tree\""
 
 myecho "Gathering process info..."
-log "$PS alx > \"$dir/ps_info\" 2>> \"$log\""
+log "$PS alx >> \"$dir/ps_info\" 2>> \"$log\""
 
 myecho "Gathering console messages..."
-log "$TAIL -n 75 /var/log/messages > \"$dir/messages\" 2>> \"$log\""
+log "$TAIL -n 75 /var/log/messages >> \"$dir/messages\" 2>> \"$log\""
 
 myecho "Gathering /etc/lvm info..."
 log "$CP -a /etc/lvm \"$dir/lvm\" 2>> \"$log\""
 
 myecho "Gathering /dev listing..."
-log "$LS -laR /dev > \"$dir/dev_listing\" 2>> \"$log\""
+log "$LS -laR /dev >> \"$dir/dev_listing\" 2>> \"$log\""
 
 myecho "Gathering /sys/block listing..."
-log "$LS -laR /sys/block > \"$dir/sysblock_listing\"  2>> \"$log\""
+log "$LS -laR /sys/block >> \"$dir/sysblock_listing\"  2>> \"$log\""
 log "$LS -laR /sys/devices/virtual/block >> \"$dir/sysblock_listing\"  2>> \"$log\""
 
 if (( $metadata )); then
@@ -233,4 +235,3 @@
 fi
 
 exit 0
-