Error handling, formatting, small fixes/additions, version 0.4

This commit is contained in:
tastytea 2015-06-05 21:06:47 +02:00
parent 9ad78bef50
commit 38f032497e
4 changed files with 29 additions and 5 deletions

View File

@ -1,3 +1,6 @@
* 2015-06-05 tastytea <tastytea@tastytea.de>
Version 0.4
Error handling
* 2015-06-05 tastytea <tastytea@tastytea.de> * 2015-06-05 tastytea <tastytea@tastytea.de>
Version 0.3 Version 0.3
Recovery Recovery

View File

@ -1,3 +1,4 @@
* Make sure you have sha*sum or md5sum installed * Make sure you have sha*sum or md5sum installed
* Make hashboot.sh executable * Make hashboot.sh executable
* Place hashboot.sh where it's needed * Place hashboot.sh where it's needed
* Install the appropriate init script

3
TODO
View File

@ -3,4 +3,5 @@
* Gentoo ebuild * Gentoo ebuild
* Debian package (done) * Debian package (done)
* Ubuntu package * Ubuntu package
* recovery (done) * recovery (done)
* Error handling (done)

View File

@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
#Hashes all files in /boot to check them during early boot #Hashes all files in /boot to check them during early boot
#Exit codes: 0 = success, 1 = wrong usage, 2 = not root, 3 = no hasher found, 4 = checksum mismatch #Exit codes: 0 = success, 1 = wrong usage, 2 = not root, 3 = no hasher found,
#4 = checksum mismatch, 5 = write error
VERSION="0.3" VERSION="0.4"
DIGEST_FILE="/var/lib/hashboot.digest" DIGEST_FILE="/var/lib/hashboot.digest"
LOG_FILE="/tmp/hashboot.log" LOG_FILE="/tmp/hashboot.log"
BACKUP_FILE="/var/cache/boot-backup.tar.gz" BACKUP_FILE="/var/cache/boot-backup.tar.gz"
@ -57,8 +58,24 @@ then
echo "#hashboot ${VERSION} - Algorithm: $(basename ${HASHER})" > ${DIGEST_FILE} echo "#hashboot ${VERSION} - Algorithm: $(basename ${HASHER})" > ${DIGEST_FILE}
#Write hashes of all regular files to ${DIGEST_FILE} #Write hashes of all regular files to ${DIGEST_FILE}
find /boot -type f -exec ${HASHER} --binary {} >> ${DIGEST_FILE} + find /boot -type f -exec ${HASHER} --binary {} >> ${DIGEST_FILE} +
if [ $? == 0 ]
then
echo "List of hashes written to ${DIGEST_FILE}"
else
echo "Error writing ${DIGEST_FILE}" >&2
die 5
fi
#Backup of good files #Backup of good files
tar -czpPf ${BACKUP_FILE} /boot tar -czpPf ${BACKUP_FILE} /boot
if [ $? == 0 ]
then
echo "Backup written to ${BACKUP_FILE}"
else
echo "Error writing ${BACKUP_FILE}" >&2
die 5
fi
die 0 die 0
elif [ "${1}" == "check" ] elif [ "${1}" == "check" ]
then then
@ -66,12 +83,14 @@ then
then then
die 0 die 0
else else
echo " !! TIME TO PANIK: A FILE WAS MODIFIED !!" echo " !! TIME TO PANIK: AT LEAST 1 FILE WAS MODIFIED !!"
echo "Restoring files from backup... (type yes or no for each file)" echo "Restoring files from backup... (type yes or no for each file)"
#For each failed file: ask if it should be recovered from backup #For each failed file: ask if it should be recovered from backup
for file in $(cut -d: -f1 ${LOG_FILE}) for file in $(cut -d: -f1 ${LOG_FILE})
do do
tar -xzpPvwf ${BACKUP_FILE} ${file} tar -xzpPvwf ${BACKUP_FILE} ${file}
[ $? != 0 ] && echo "Error restoring ${file} from backup, continuing"
done done
echo -n "Type reboot to reboot now, otherwise you get a shell: " echo -n "Type reboot to reboot now, otherwise you get a shell: "