projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed sys handler bracket problem
[matthijs/upstream/backupninja.git]
/
handlers
/
sys
diff --git
a/handlers/sys
b/handlers/sys
index 9b836a7efce3ce43191c51f5e6dba05f6dfe6c80..e095b45f1958392bcdce7745483f8e0e738c47f3 100755
(executable)
--- 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 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
# See if vservers are configured
if [ "$vservers" = "yes" ]
then
@@
-44,7
+49,7
@@
if [ "$packages" == "yes" ]; then
for vserver in `ls $VROOTDIR |grep -v lost+found`
do
running=`vserver-info $vserver RUNNING`
for vserver in `ls $VROOTDIR |grep -v lost+found`
do
running=`vserver-info $vserver RUNNING`
- if [ $running = 1]; then
+ 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"
if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; then
warning "can't find dpkg in vserver $vserver, skipping installed packages report."
nodpkg="$nodpkg $vserver"
@@
-64,18
+69,18
@@
if [ "$packages" == "yes" ]; then
fi
if [ "$partitions" == "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
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
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
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
# 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}
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
done
fi
@@
-133,10
+138,10
@@
if [ "$hardware" == "yes" ]; then
fi
touch $hardwarefile
echo -e "\n\n====================== summary ======================\n" >> $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
+ 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
for flag in cpu network disk bios pci; do
echo -e "\n\n====================== $flag ======================\n" >> $hardwarefile
-
hwinfo
--$flag >> $hardwarefile
+
$HWINFO
--$flag >> $hardwarefile
done
fi
done
fi