fixed bug with __star__ and sys handler.

well, not really, but i worked around a bug that i don't understand.
This commit is contained in:
Elijah Saxon 2005-03-14 21:49:29 +00:00
parent 2064c73896
commit 907f7d4455
4 changed files with 12 additions and 8 deletions

View File

@ -143,7 +143,6 @@ function getconf() {
# replace * with %, so that it is not globbed. # replace * with %, so that it is not globbed.
ret="${ret//\\*/__star__}" ret="${ret//\\*/__star__}"
ret="${ret//\*/__star__}"
# this is weird, but single quotes are needed to # this is weird, but single quotes are needed to
# allow for returned values with spaces. $ret is still expanded # allow for returned values with spaces. $ret is still expanded

View File

@ -1,10 +1,13 @@
version 0.4.3 -- Jan 20 2005 version 0.4.3 -- ????
results of handlers are now read line by line. results of handlers are now read line by line.
changes to rdiff handler: added "options", and "keep" is not necessarily days now. changes to rdiff handler: added "options", and "keep" is
not necessarily days now (ie, it will pass straight through to
rdiff-backup if the keep has a unit on it, otherwise it adds the 'D').
added dup handler (still pretty beta) added dup handler (still pretty beta)
added maildir handler (very specialized handler) added maildir handler (very specialized handler)
added --run option (runs the specified action file) added --run option (runs the specified action file)
improved sys handler, now uses hwinfo improved sys handler, now uses hwinfo
added PATH to cron.d file, which fixes file not found errors.
version 0.4.2 -- Jan 6 2005 version 0.4.2 -- Jan 6 2005
fixed bug which caused a report email to be sent even if no actions were run. fixed bug which caused a report email to be sent even if no actions were run.

View File

@ -2,6 +2,8 @@
# this config file will save various reports of vital system information. # this config file will save various reports of vital system information.
# by default, all the reports are enabled and are saved in /var/backups. # by default, all the reports are enabled and are saved in /var/backups.
# #
# requires dpkg, sfdisk, and hwinfo
#
# (1) a list of all the packages installed and removed. # (1) a list of all the packages installed and removed.
# this file can be used to restore the state of installed packages # this file can be used to restore the state of installed packages
# by running "dpkg --set-selections < dpkg-selections.txt # by running "dpkg --set-selections < dpkg-selections.txt
@ -14,8 +16,7 @@
# (MAKE SURE YOU PARTITION THE CORRECT DISK!!!) # (MAKE SURE YOU PARTITION THE CORRECT DISK!!!)
# #
# (3) hardware information. # (3) hardware information.
# a simple report is generated of the kernel modules, the devices, # detailed information on most important aspects of the hardware.
# and the model of the hardware which 'discover' is able to detect.
# #
# here are the defaults, commented out: # here are the defaults, commented out:
@ -24,7 +25,7 @@
# packagesfile = /var/backups/dpkg-selections.txt # packagesfile = /var/backups/dpkg-selections.txt
# partitions = yes # partitions = yes
# partitionsfile = /var/backups/partitions.*.txt # partitionsfile = /var/backups/partitions.__star__.txt
# hardware = yes # hardware = yes
# hardwarefile = /var/backups/hardware.txt # hardwarefile = /var/backups/hardware.txt

View File

@ -14,14 +14,14 @@
# (MAKE SURE YOU PARTITION THE CORRECT DISK!!!) # (MAKE SURE YOU PARTITION THE CORRECT DISK!!!)
# #
# (3) hardware information. # (3) hardware information.
# write to a text file the important things which hwinfo can discover. # write to a text file the important things which hwinfo can gleen.
# #
getconf packages yes getconf packages yes
getconf packagesfile /var/backups/dpkg-selections.txt getconf packagesfile /var/backups/dpkg-selections.txt
getconf partitions yes getconf partitions yes
getconf partitionsfile '/var/backups/partitions.*.txt' getconf partitionsfile /var/backups/partitions.__star__.txt
getconf hardware yes getconf hardware yes
getconf hardwarefile /var/backups/hardware.txt getconf hardwarefile /var/backups/hardware.txt
@ -91,6 +91,7 @@ if [ "$hardware" == "yes" ]; then
fi fi
touch $hardwarefile touch $hardwarefile
echo -e "\n\n====================== summary ======================\n" >> $hardwarefile echo -e "\n\n====================== summary ======================\n" >> $hardwarefile
debug "hwinfo --short --cpu --network --disk --pci >> $hardwarefile"
hwinfo --short --cpu --network --disk --pci >> $hardwarefile hwinfo --short --cpu --network --disk --pci >> $hardwarefile
for flag in cpu network disk bios pci; do for flag in cpu network disk bios pci; do
echo -e "\n\n====================== $flag ======================\n" >> $hardwarefile echo -e "\n\n====================== $flag ======================\n" >> $hardwarefile