Initial modular

hashboot

@@ -29,6 +29,9 @@ CONFIG_FILE="/etc/hashboot.cfg"
 COUNTER=0
 DD_STATUS="none"
 PROGRAMMER="no" #standard change enables bios mode
+#1=mbr 2=files 3=bios 4=mbr/files 5=mbr/bios 6=files/bios 7=all
+test="5"
+
 
 #Umount /boot if we mounted it, exit with given exit code
 die ()
@@ -46,17 +49,26 @@ write_hashes ()
 {
     #Write header to ${1}
     echo "#hashboot ${VERSION} - Algorithm: $(basename ${HASHER})" > ${1}
-    #Write MBR of MBR_DEVICE to ${1}
+
+    case $test in
+        1|4|5|7)
+            #copy mbr to file
             dd if=${MBR_DEVICE} of=${MBR_TMP} bs=${MBR_SIZE}K count=1 status=${DD_STATUS} || die 8
-    #Write bios to ${1}
+            #Write hash of MBR to ${1}
-    #if we set an programmer chip in config, read bios and write it to digestfile.
+            ${HASHER} ${MBR_TMP} >> ${1} ;; esac
+    case $test in
+        3|5|6|7)
+            #if we set an programmer chip in config
             if [ ! ${PROGRAMMER} == "no" ]; then
+                #read bios to file
                 flashrom --programmer ${PROGRAMMER} -r ${BIOS_TMP} > /dev/null 2>&1
+                #and write hashes of bios files to ${1}
                 ${HASHER} ${BIOS_TMP} >> ${1}
-    fi
+            fi ;; esac
+    case $test in
+        2|4|6|7)
             #Write hashes of all regular files to ${1}
-    ${HASHER} ${MBR_TMP} >> ${1}
+            find /boot -type f -exec ${HASHER} --binary {} >> ${1} + ;; esac
-    find /boot -type f -exec ${HASHER} --binary {} >> ${1} +
 }
 
 #If we're not root: exit
@@ -118,10 +130,13 @@ else
         echo "MBR_DEVICE=${MBR_DEVICE}" >> ${CONFIG_FILE}
         echo "#Where the Backup files are stored" >> ${CONFIG_FILE}
         echo "BACKUP_FILE=${BACKUP_FILE}" >> ${CONFIG_FILE}
+        echo "test=5" >> ${CONFIG_FILE}
         echo "PROGRAMMER=${PROGRAMMER}" >> ${CONFIG_FILE}
     fi
 fi
 
+case $test in
+    1|4|5|7)
         # Find out where the first partition starts and set ${MBR_SIZE} in KiB
         sectorsize=$(LC_ALL=C fdisk -l ${MBR_DEVICE} | grep '^Units' | awk '{print $8}' )
         if [ "${sectorsize}" == "=" ] # Older versions of util-linux
@@ -141,6 +156,7 @@ then
             echo "Something went wrong. Most likely your partition table is corrupt." >&2
             die 1 "You have to recover the MBR manually by copying the mbr from ${BACKUP_FILE}"
         fi
+;; esac
 
 if [ "${1}" == "index" ]
 then
@@ -189,19 +205,18 @@ elif [ "${1}" == "check" ]
 then
     [ -f ${DIGEST_FILE} ] || die 9 "No digestfile"
     HASHER=$(head -n1 ${DIGEST_FILE} | awk '{print $5}')
+    case $test in
+        1|4|5|7)
             dd if=${MBR_DEVICE} of=${MBR_TMP} bs=${MBR_SIZE}K count=1 status=${DD_STATUS} || die 8
-    flashrom --programmer ${PROGRAMMER} -r ${BIOS_TMP} > /dev/null 2>&1
                 if ! grep ${MBR_TMP} ${DIGEST_FILE} | ${HASHER} --check --warn --quiet --strict | tee ${LOG_FILE}
                 then
                 echo "    !! TIME TO PANIK: MBR WAS MODIFIED !!"
                 COUNTER=$((COUNTER + 1))
-    fi
+    fi;; esac
-    if ! grep -v ${MBR_TMP} ${DIGEST_FILE} | grep -v ${BIOS_TMP} | ${HASHER} --check --warn --quiet --strict | tee -a ${LOG_FILE}
+
-    then
+    case $test in
-        echo "    !! TIME TO PANIK: AT LEAST 1 FILE WAS MODIFIED !!"
+        3|5|6|7)
-        COUNTER=$((COUNTER + 2))
+            flashrom --programmer ${PROGRAMMER} -r ${BIOS_TMP} > /dev/null 2>&1
-        die $COUNTER
-    fi
             #if we set an programmer chip in config, find line with hash for bios and compare. if smthg wrong, panic
             if [ ! ${PROGRAMMER} == "no" ]; then
                 if grep ${BIOS_TMP} ${DIGEST_FILE} | ${HASHER} --check --warn --quiet --strict | tee -a ${LOG_FILE}
@@ -210,7 +225,16 @@ then
                 COUNTER=$((COUNTER + 10))
                 die $COUNTER
         fi
-    fi
+    fi ;; esac
+    case $test in
+        2|4|6|7)
+            if ! grep -v ${MBR_TMP} ${DIGEST_FILE} | grep -v ${BIOS_TMP} | ${HASHER} --check --warn --quiet --strict | tee -a ${LOG_FILE}
+            then
+                echo "    !! TIME TO PANIK: AT LEAST 1 FILE WAS MODIFIED !!"
+                COUNTER=$((COUNTER + 2))
+                 die $COUNTER
+            fi ;; esac
+
 
 elif [ "${1}" == "recover" ]
 then