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

diff --git a/handlers/sys b/handlers/sys
index 9b836a7..bc117c4 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -26,6 +26,11 @@ 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
@@ -64,18 +69,18 @@ if [ "$packages" == "yes" ]; then
 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 "`which hwinfo`" ]; then
+	if [ ! -x "$HWINFO" ]; then
 		warning "can't find hwinfo, skipping partition report."
 		partitions="no"
 	fi
 fi
 
 if [ "$hardware" == "yes" ]; then
-	if [ ! -x "`which hwinfo`" ]; then
+	if [ ! -x "$HWINFO" ]; then
 		warning "can't find hwinfo, skipping hardware report."
 		hardware="no"
 	fi
@@ -109,14 +114,14 @@ fi
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-	devices=`hwinfo --disk | grep "Device File" | cut -d\  -f5`
+	devices=`$HWINFO --disk | grep "Device File" | cut -d\  -f5`
 	for dev in $devices; do
 		[ -b $dev ] || continue
 		label=${dev#/dev/}
 		label=${label//\//-}
 		outputfile=${partitionsfile//__star__/$label}
-		debug "sfdisk -d $dev > $outputfile"
-		sfdisk -d $dev > $outputfile
+		debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
+		$SFDISK $sfdisk_options -d $dev > $outputfile
 	done
 fi
 
@@ -133,10 +138,10 @@ if [ "$hardware" == "yes" ]; then
 	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
+	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
+		$HWINFO --$flag >> $hardwarefile
 	done
 fi