X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=349f284817048dd29c23f59195964393b0240d72;hb=8bc9312e15bf0284b3767e1791c0de3522f410f2;hp=140db766f128a460fc5fd6b66cd2f20170d356ff;hpb=6bc45553f06e6c9b7c1162253bd0e28f3b07bbf2;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/sys b/handlers/sys index 140db76..349f284 100755 --- a/handlers/sys +++ b/handlers/sys @@ -1,3 +1,4 @@ +# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*- # # this handler will save various reports of vital system information. # by default, all the reports are enabled and are saved in /var/backups. @@ -14,35 +15,73 @@ # (MAKE SURE YOU PARTITION THE CORRECT DISK!!!) # # (3) hardware information. -# a simple report is generated of the kernel modules, the devices, -# and the model of the hardware which 'discover' is able to detect. +# write to a text file the important things which hwinfo can gleen. +# getconf packages yes getconf packagesfile /var/backups/dpkg-selections.txt getconf partitions yes -getconf partitionsfile /var/backups/partitions.*.txt +getconf partitionsfile /var/backups/partitions.__star__.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 +local usevserver=no +if [ $vservers_are_available = yes ] +then + info "vserver method enabled" + usevserver=yes +fi + if [ "$packages" == "yes" ]; then - if [ ! -x "`which dpkg`" ]; then - warning "can't find dpkg, skipping installed packages report." - packages="no" + if [ $usevserver = yes ] + then + nodpkg="lost+found|ARCHIVES" + info "vserver root directory set to: $VROOTDIR" + for vserver in $found_vservers + do + info "examining vserver: $vserver" + running=`$VSERVERINFO $vserver RUNNING` + if [ "$running" = "1" ]; then + if [ ! -x "$VROOTDIR/$vserver`$VSERVER $vserver exec which dpkg`" ]; then + warning "can't find dpkg in vserver $vserver, skipping installed packages report." + nodpkg="$nodpkg|$vserver" + fi + else + warning "vserver $vserver is not running, skipping installed packages report." + nodpkg="$nodpkg|$vserver" + fi + + done + else + if [ ! -x "`which dpkg`" ]; then + warning "can't find dpkg, skipping installed packages report." + packages="no" + fi fi 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 + if [ ! -x "$HWINFO" ]; then + warning "can't find hwinfo, skipping partition report." + partitions="no" + fi fi if [ "$hardware" == "yes" ]; then - if [ ! -x "`which discover`" ]; then - warning "can't find discover, skipping hardware report." + if [ ! -x "$HWINFO" ]; then + warning "can't find hwinfo, skipping hardware report." hardware="no" fi fi @@ -54,46 +93,56 @@ fi # if [ "$packages" == "yes" ]; then - dpkg --get-selections > $packagesfile + if [ $usevserver = yes ] + then + for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` + do + debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile" + $VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile + done + fi + +# We want to perform this on the host as well + if [ "$packages" == "yes" ]; then + debug "dpkg --get-selections > $packagesfile" + dpkg --get-selections > $packagesfile + fi fi ## PARTITIONS ############################# -# # here we use sfdisk to dump a listing of all the partitions. # these files can be used to directly partition a disk of the same size. -# if [ "$partitions" == "yes" ]; then - for i in `sfdisk -l | grep "^/dev/" | awk '{print $1}'`; do - devices=`echo $i | sed 's/[0-9]//'` - done - devices=`echo $devices | sort | uniq` + devices=`$HWINFO --disk | grep "Device File" | cut -d\ -f5` for dev in $devices; do - # remove leading /dev/ - label=${devices#/dev/} - # replace any remaining '/' + [ -b $dev ] || continue + label=${dev#/dev/} label=${label//\//-} outputfile=${partitionsfile//__star__/$label} - sfdisk -d $dev > $outputfile + debug "$SFDISK $sfdisk_options -d $dev > $outputfile" + $SFDISK $sfdisk_options -d $dev > $outputfile done fi ## HARDWARE ############################# # -# here we use discover to dump a table listing all the +# 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 - printf "%15s%15s %s / %s\n" "kernel module" "device" "vender" "model" > $hardwarefile - printf "%15s%15s %s / %s\n\n" "=============" "======" "======" "=====" >> $hardwarefile - oldifs=$IFS - IFS=$'\t\n' - discover --format="'%m'\t'%d'\t'%V'\t'%M'\n" all | \ - while read module device vender model - do printf "%15s%15s %s / %s\n" "${module//\'/}" "${device//\'/}" "${vender//\'/}" "${model//\'/}" >> $hardwarefile - done - IFS=$oldifs + 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