fi
getconf packages yes
+getconf dosfdisk yes
+getconf dohwinfo yes
if [ $os = "debian" ]
then
getconf packagesfile /var/backups/dpkg-selections.txt
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
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
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 #############################
# 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
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