Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso/initcpio/hooks
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2014-06-28 00:35:51 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2014-06-28 00:35:51 -0300
commitb3e1d31343ec7d4b9011bfdb76e4c9843ba31dc5 (patch)
tree1c9d782060fe953abb8370ef3f261e2012c11e6e /archiso/initcpio/hooks
parent4890ce0b67044bb5664b5124c1f3e3f8964ade89 (diff)
[archiso] Rework checksum function
Diffstat (limited to 'archiso/initcpio/hooks')
-rw-r--r--archiso/initcpio/hooks/archiso10
-rw-r--r--archiso/initcpio/hooks/archiso_pxe_http2
2 files changed, 6 insertions, 6 deletions
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index c5fd062..26bdedc 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/hooks/archiso
@@ -93,8 +93,8 @@ _mnt_dev() {
_verify_checksum() {
local _status
- cd "/run/archiso/bootmnt/${archisobasedir}"
- md5sum -c checksum.${arch}.md5 > /tmp/checksum.${arch}.log 2>&1
+ cd "/run/archiso/bootmnt/${archisobasedir}/${arch}"
+ md5sum -c airootfs.md5 > /tmp/checksum.log 2>&1
_status=$?
cd "${OLDPWD}"
return ${_status}
@@ -142,17 +142,17 @@ archiso_mount_handler() {
fi
if [[ "${checksum}" == "y" ]]; then
- if [[ -f "/run/archiso/bootmnt/${archisobasedir}/checksum.${arch}.md5" ]]; then
+ if [[ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.md5" ]]; then
msg -n ":: Self-test requested, please wait..."
if _verify_checksum; then
msg "done. Checksum is OK, continue booting."
else
echo "ERROR: one or more files are corrupted"
- echo "see /tmp/checksum.${arch}.log for details"
+ echo "see /tmp/checksum.log for details"
launch_interactive_shell
fi
else
- echo "ERROR: checksum=y option specified but checksum.${arch}.md5 not found"
+ echo "ERROR: checksum=y option specified but ${archisobasedir}/${arch}/airootfs.md5 not found"
launch_interactive_shell
fi
fi
diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http
index 84ce17f..a23e952 100644
--- a/archiso/initcpio/hooks/archiso_pxe_http
+++ b/archiso/initcpio/hooks/archiso_pxe_http
@@ -37,7 +37,7 @@ archiso_pxe_http_mount_handler () {
_curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}"
if [[ "${checksum}" == "y" ]]; then
- _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/"
+ _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.md5" "/"
fi
mkdir -p "/run/archiso/bootmnt"