From bb503b90308ea12542c85dea9b799e11632158a6 Mon Sep 17 00:00:00 2001
From: Simon Wilper <sxw@chronowerks.de>
Date: Fri, 1 Jan 2021 03:15:33 +0100
Subject: add optional pv tool

use pv to give feedback on copying the airootfs to RAM when copytoram
kernel parameter is given
---
 archiso/initcpio/hooks/archiso   | 15 ++++++++++++++-
 archiso/initcpio/install/archiso |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'archiso')

diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index 1b848ce..485fb0f 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/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 [ -x /usr/bin/pv ]; 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
diff --git a/archiso/initcpio/install/archiso b/archiso/initcpio/install/archiso
index 74948c7..df0f6b5 100644
--- a/archiso/initcpio/install/archiso
+++ b/archiso/initcpio/install/archiso
@@ -18,6 +18,7 @@ build() {
     add_binary truncate
     add_binary gpg
     add_binary grep
+    add_binary pv
 
     add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
     add_file /usr/lib/udev/rules.d/10-dm.rules
-- 
cgit v1.2.3-70-g09d2