Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/hooks
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2021-05-29 10:47:24 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-05-29 10:47:24 +0200
commitfa48377c8c3994b63657e03273e7f75c15bc10c9 (patch)
tree9887dbed475a63c0f204101b9afc1150ba914e91 /hooks
parent3a5877d9f913d1151e8f729a46a7ecef643252b0 (diff)
parent756c9dbeb6d693158587ae6e0116156ef5aa1af6 (diff)
Merge remote-tracking branch 'sxw/copytoram'
* sxw/copytoram: Apply copytoram Boot Option Menu Entries also to releng Fence add_binary for pv Reorder UEFI boot menu entries Update README.bootparams Apply 1 suggestion(s) to 1 file(s) add optional pv tool
Diffstat (limited to 'hooks')
-rw-r--r--hooks/archiso15
1 files changed, 14 insertions, 1 deletions
diff --git a/hooks/archiso b/hooks/archiso
index 1b848ce..d897ae1 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -69,10 +69,23 @@ _mnt_sfs() {
# defined via initcpio's parse_cmdline()
if [ "${copytoram}" = "y" ]; then
msg -n ":: Copying squashfs image to RAM..."
- if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
+
+ # in case we have pv use it to display copy progress feedback otherwise
+ # fallback to using plain cp
+ if command -v pv > /dev/null 2>&1; then
+ echo ""
+ (pv "${img}" > "/run/archiso/copytoram/${img_fullname}")
+ local rc=$?
+ else
+ (cp -- "${img}" "/run/archiso/copytoram/${img_fullname}")
+ local rc=$?
+ fi
+
+ if [ $rc != 0 ]; then
echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'"
launch_interactive_shell
fi
+
img="/run/archiso/copytoram/${img_fullname}"
msg "done."
fi