Skip to content

Commit

Permalink
Reworked integrity-check (Closes: #507477).
Browse files Browse the repository at this point in the history
* Changes:

 - it reboots only if it succeed, otherwise it panics.
 - it checks md5sum just after media is mounted, not after /root is
   mounted. This allow a faster and safer reboot.

Signed-off-by: Marco Amadori <amadorim@vdavda.com>
  • Loading branch information
Marco Amadori committed Dec 2, 2008
1 parent cd8d575 commit 0412594
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 29 deletions.
36 changes: 36 additions & 0 deletions scripts/live
Expand Up @@ -109,6 +109,11 @@ Arguments ()
export IGNORE_UUID
;;

integrity-check)
INTEGRITY_CHECK="Yes"
export INTEGRITY_CHECK
;;

ip=*)
STATICIP="${ARGUMENT#ip=}"

Expand Down Expand Up @@ -1426,6 +1431,32 @@ set_usplash_timeout ()
fi ; fi
}

integrity_check ()
{
media_mountpoint="${1}"

log_begin_msg "Checking media integrity"

cd ${media_mountpoint}
/bin/md5sum -c md5sum.txt < /dev/tty8 > /dev/tty8
RC="${?}"

log_end_msg

if [ "${RC}" -eq 0 ]
then
log_success_msg "Everything ok, will reboot in 10 seconds."
sleep 10
cd /
umount ${media_mountpoint}
sync
echo u > /proc/sysrq-trigger
echo b > /proc/sysrq-trigger
else
panic "Not ok, a media defect is likely, switch to VT8 for details."
fi
}

mountroot ()
{
if [ -x /scripts/local-top/cryptroot ]; then
Expand Down Expand Up @@ -1492,6 +1523,11 @@ mountroot ()
panic "Unable to find a medium containing a live file system"
fi

if [ "${INTEGRITY_CHECK}" ]
then
integrity_check "${livefs_root}"
fi

if [ "${TORAM}" ]
then
live_dest="ram"
Expand Down
29 changes: 0 additions & 29 deletions scripts/live-bottom/01integrity_check

This file was deleted.

0 comments on commit 0412594

Please sign in to comment.