typo in backupninja.1

[matthijs/upstream/backupninja.git] / handlers / sys

diff --git a/handlers/sys b/handlers/sys
index 677d5eee1b72ece94935c8e4fdf138b6a8fb88a9..2e181c85c2a27fba52f3441958eec01ea79bcd0b 100755 (executable)
--- 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
@@ -188,7 +190,7 @@ elif [ $os = "debian" ]; then
        echo "Level: $level" >> $sysreportfile
        for f in /etc/rc${level}.d/*; do
        # Remove /etc/Knn or Snn from beginning
-          ff=$(echo $f | sed 's_/etc/rc..d/[KS][0-9][0-9]__')
+          ff=$(echo $f | @SED@ 's_/etc/rc..d/[KS][0-9][0-9]__')
           if [ $f != $ff ]; then
              echo $ff >> $sysreportfile
           fi
@@ -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,37 +472,27 @@ fi
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-       devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/  -f2,3 | cut -d: -f1`
+   if [ "$dosfdisk" == "yes" ]; then
+      devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
        if [ "$devices" == "" ]; then 
           warning "No harddisks found" 
        fi
        for dev in $devices; do
+                debug "$SFDISK will try to backup partition tables for device $dev"
                [ -b $dev ] || continue
                label=${dev#/dev/}
                label=${label//\//-}
                outputfile=${partitionsfile//__star__/$label}
-               debug "$SFDISK $sfdisk_options -d /$dev > $outputfile"
-               $SFDISK $sfdisk_options -d /$dev > $outputfile
-       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
+               debug "$SFDISK $sfdisk_options -d $dev > $outputfile 2>/dev/null"
+               $SFDISK $sfdisk_options -d $dev > $outputfile 2>/dev/null
+                if [ $? -ne 0 ]; then
+                   warning "The partition table for $dev could not be saved."
+                fi
        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