diff options
Diffstat (limited to 'handlers')
| -rwxr-xr-x | handlers/sys | 59 | ||||
| -rw-r--r-- | handlers/sys.helper | 4 |
2 files changed, 41 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 diff --git a/handlers/sys.helper b/handlers/sys.helper index b6e3b8c..6451ae2 100644 --- a/handlers/sys.helper +++ b/handlers/sys.helper @@ -7,16 +7,19 @@ sys_wizard() { checkBox "new sys action" "check options" \ "packages" "list of all installed packages." on \ "partitions" "the partition table of all disks." on \ + "sfdisk" "use sfdisk to get partition information." on \ "hardware" "detailed hardware information" on [ $? = 1 ] && return; result="$REPLY" packages="packages = no" partitions="partitions = no" + sfdisk="dosfdisk = no" hardware="hardware = no" for opt in $result; do case $opt in '"packages"') packages="packages = yes";; '"partitions"') partitions="partitions = yes";; + '"sfdisk"') sfdisk="dosfdisk = yes";; '"hardware"') hardware="hardware = yes";; esac done @@ -24,6 +27,7 @@ sys_wizard() { cat > $next_filename <<EOF $packages $partitions +$sfdisk $hardware # packagesfile = /var/backups/dpkg-selections.txt # partitionsfile = /var/backups/partitions.__star__.txt |