X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=bc117c406d899039039ffb3952114c38bd4d86b1;hb=5cc6f5e5f0531c3905cfdc8c9d3b8c50632baecf;hp=140db766f128a460fc5fd6b66cd2f20170d356ff;hpb=6bc45553f06e6c9b7c1162253bd0e28f3b07bbf2;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/sys b/handlers/sys
index 140db76..bc117c4 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -14,35 +14,74 @@
 #     (MAKE SURE YOU PARTITION THE CORRECT DISK!!!)
 #
 # (3) hardware information. 
-#     a simple report is generated of the kernel modules, the devices,
-#     and the model of the hardware which 'discover' is able to detect.
+#     write to a text file the important things which hwinfo can gleen.
+#
 
 getconf packages yes
 getconf packagesfile /var/backups/dpkg-selections.txt
 
 getconf partitions yes
-getconf partitionsfile /var/backups/partitions.*.txt
+getconf partitionsfile /var/backups/partitions.__star__.txt
 
 getconf hardware yes
 getconf hardwarefile /var/backups/hardware.txt
 
+getconf SFDISK `which sfdisk`
+getconf HWINFO `which hwinfo`
+getconf sfdisk_options ""
+getconf hwinfo_options ""
+
+# See if vservers are configured
+if [ "$vservers" = "yes" ]
+then
+	if [ ! -d $VROOTDIR ]
+	then
+		fatal "vservers enabled, but $VROOTDIR does not exist!"
+	else
+		info "vserver method enabled"
+		usevserver=1
+	fi
+fi
+
 if [ "$packages" == "yes" ]; then
-	if [ ! -x "`which dpkg`" ]; then
-		warning "can't find dpkg, skipping installed packages report."
-		packages="no"
+	if [ $usevserver ]
+	then
+		for vserver in `ls $VROOTDIR |grep -v lost+found`
+		do
+			running=`vserver-info $vserver RUNNING`
+			if [ $running = 1]; then
+			    if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; then
+				warning "can't find dpkg in vserver $vserver, skipping installed packages report."
+				nodpkg="$nodpkg $vserver"
+			    fi
+			else
+			    warning "vserver $vserver is not running, skipping installed packages report."
+			    nodpkg="$nodpkg $vserver"
+			fi
+
+		done
+	else
+		if [ ! -x "`which dpkg`" ]; then
+			warning "can't find dpkg, skipping installed packages report."
+			packages="no"
+		fi
 	fi
 fi
 
 if [ "$partitions" == "yes" ]; then
-	if [ ! -x "`which sfdisk`" ]; then
+	if [ ! -x "$SFDISK" ]; then
 		warning "can't find sfdisk, skipping partition report."
 		partitions="no"
 	fi
+	if [ ! -x "$HWINFO" ]; then
+		warning "can't find hwinfo, skipping partition report."
+		partitions="no"
+	fi
 fi
 
 if [ "$hardware" == "yes" ]; then
-	if [ ! -x "`which discover`" ]; then
-		warning "can't find discover, skipping hardware report."
+	if [ ! -x "$HWINFO" ]; then
+		warning "can't find hwinfo, skipping hardware report."
 		hardware="no"
 	fi
 fi
@@ -53,47 +92,56 @@ fi
 # here we grab a list of the packages installed and removed.
 #
 
+if [ $usevserver ]
+then
+	for vserver in `ls $VROOTDIR | grep -v $nodpkg | grep -v lost+found`
+	do
+		debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile"
+		$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile
+	done
+fi
+
+# We want to perform this on the host as well
 if [ "$packages" == "yes" ]; then
+	debug "dpkg --get-selections > $packagesfile"
 	dpkg --get-selections > $packagesfile
 fi
 
+
 ## PARTITIONS #############################
 
-#
 # here we use sfdisk to dump a listing of all the partitions. 
 # these files can be used to directly partition a disk of the same size.
-#
 
 if [ "$partitions" == "yes" ]; then
-	for i in `sfdisk -l | grep "^/dev/" | awk '{print $1}'`; do
-		devices=`echo $i | sed 's/[0-9]//'`
-	done
-	devices=`echo $devices | sort | uniq`
+	devices=`$HWINFO --disk | grep "Device File" | cut -d\  -f5`
 	for dev in $devices; do
-		# remove leading /dev/
-		label=${devices#/dev/}
-		# replace any remaining '/'
+		[ -b $dev ] || continue
+		label=${dev#/dev/}
 		label=${label//\//-}
 		outputfile=${partitionsfile//__star__/$label}
-		sfdisk -d $dev > $outputfile
+		debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
+		$SFDISK $sfdisk_options -d $dev > $outputfile
 	done
 fi
 
 ## HARDWARE #############################
 
 #
-# here we use discover to dump a table listing all the
+# here we use hwinfo to dump a table listing all the
 # information we can find on the hardware of this machine
 # 
 
 if [ "$hardware" == "yes" ]; then
-	printf "%15s%15s    %s / %s\n" "kernel module" "device" "vender" "model" > $hardwarefile
-	printf "%15s%15s    %s / %s\n\n" "=============" "======" "======" "=====" >> $hardwarefile
-	oldifs=$IFS
-	IFS=$'\t\n'
-	discover --format="'%m'\t'%d'\t'%V'\t'%M'\n" all | \
-		while read module device vender model
-	    	do printf "%15s%15s    %s / %s\n" "${module//\'/}" "${device//\'/}" "${vender//\'/}" "${model//\'/}" >> $hardwarefile
-		done
-	IFS=$oldifs
+	if [ -f $hardwarefile ]; then
+		rm $hardwarefile
+	fi
+	touch $hardwarefile
+	echo -e "\n\n====================== summary ======================\n" >>  $hardwarefile
+	debug "$HWINFO --short --cpu --network --disk --pci  >> $hardwarefile"
+	$HWINFO --short --cpu --network --disk --pci  >> $hardwarefile
+	for flag in cpu network disk bios pci; do
+		echo -e "\n\n====================== $flag ======================\n" >>  $hardwarefile
+		$HWINFO --$flag >> $hardwarefile
+	done
 fi