From c3914f980fa2c59fa42bc17af73200cf5365bbf9 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
---
 hooks/archiso | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'hooks')

diff --git a/hooks/archiso b/hooks/archiso
index 1b848ce..485fb0f 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 [ -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
-- 
cgit v1.2.3-70-g09d2


From 22b57518a6e16ff85224f3aa6601e6b70831e534 Mon Sep 17 00:00:00 2001
From: Simon Wilper <sxw@chronowerks.de>
Date: Tue, 5 Jan 2021 13:04:39 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

---
 hooks/archiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hooks')

diff --git a/hooks/archiso b/hooks/archiso
index 485fb0f..d897ae1 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -72,7 +72,7 @@ _mnt_sfs() {
 
         # in case we have pv use it to display copy progress feedback otherwise
         # fallback to using plain cp
-        if [ -x /usr/bin/pv ]; then
+        if command -v pv > /dev/null 2>&1; then
             echo ""
             (pv "${img}" > "/run/archiso/copytoram/${img_fullname}")
             local rc=$?
-- 
cgit v1.2.3-70-g09d2