Splitting out integrity-check function to subscript.
authorDaniel Baumann <daniel@debian.org>
Tue, 5 Jun 2012 14:55:08 +0000 (16:55 +0200)
committerDaniel Baumann <daniel@debian.org>
Tue, 5 Jun 2012 17:35:56 +0000 (19:35 +0200)
scripts/boot.sh
scripts/boot/integrity-check.sh [new file with mode: 0755]

index 3211ed0..90750b5 100755 (executable)
@@ -429,32 +429,6 @@ find_livefs ()
        return 1
 }
 
-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
diff --git a/scripts/boot/integrity-check.sh b/scripts/boot/integrity-check.sh
new file mode 100755 (executable)
index 0000000..08f9583
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#set -e
+
+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
+}