aboutsummaryrefslogtreecommitdiff
path: root/handlers/sys
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2007-03-04 10:29:26 +0000
committerMicah Anderson <micah@riseup.net>2007-03-04 10:29:26 +0000
commitc0126ff1ef90513ce5df48fc41326704a2cef555 (patch)
treeb3dc121268c91ac4d6c688b73e4deefafba22fe5 /handlers/sys
parent05c26446ed65681528387f6c66473c61eebe7224 (diff)
downloadbackupninja-c0126ff1ef90513ce5df48fc41326704a2cef555.tar.gz
backupninja-c0126ff1ef90513ce5df48fc41326704a2cef555.tar.bz2
added ninjareport
added ale to AUTHORS for ldap fixes adjusted sys handler to allow for turning off of sfdisk (#404071)
Diffstat (limited to 'handlers/sys')
-rwxr-xr-xhandlers/sys59
1 files changed, 37 insertions, 22 deletions
diff --git a/handlers/sys b/handlers/sys
index ce9c5b0..3e7f03e 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -33,6 +33,8 @@ else
fi
getconf packages yes
+getconf dosfdisk yes
+getconf dohwinfo yes
if [ $os = "debian" ]
then
getconf packagesfile /var/backups/dpkg-selections.txt
@@ -419,14 +421,18 @@ if [ $usevserver = yes ]; then
fi
if [ "$partitions" == "yes" ]; then
+ if [ "$dosfdisk" == "yes" ]; then
if [ ! -x "$SFDISK" ]; then
warning "can't find sfdisk, skipping sfdisk report."
partitions="no"
fi
+ fi
+ if [ "$dohwinfo" == "yes" ]; then
if [ ! -x "$HWINFO" ]; then
warning "can't find hwinfo, skipping partition report."
partitions="no"
fi
+ fi
fi
if [ "$hardware" == "yes" ]; then
@@ -436,6 +442,29 @@ if [ "$hardware" == "yes" ]; then
fi
fi
+## HARDWARE #############################
+
+#
+# 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
+ if [ "dohwinfo" == "yes" ]; then
+ 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 bios pci; do
+ echo -e "\n\n====================== $flag ======================\n" >> $hardwarefile
+ $HWINFO --$flag >> $hardwarefile
+ done
+ fi
+fi
+
## PARTITIONS #############################
@@ -443,7 +472,8 @@ fi
# these files can be used to directly partition a disk of the same size.
if [ "$partitions" == "yes" ]; then
- devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
+ if [ "$dosfdisk" == "yes" ]; then
+ devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
if [ "$devices" == "" ]; then
warning "No harddisks found"
fi
@@ -459,25 +489,10 @@ if [ "$partitions" == "yes" ]; then
warning "The partition table for $dev could not be saved."
fi
done
-fi
-
-## HARDWARE #############################
-
-#
-# 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
- 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
+ if [ "$dohwinfo" == "yes" ]; then
+ debug "Using $HWINFO to get all available disk information"
+ echo -e "\n\n====================== $disk ======================\n" >> $hardwarefile
+ $HWINFO --disk >> $hardwarefile
+ fi
fi