From 50b2b4e56aa6f6dfaff61d7fcfa5da3ecad87167 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Tue, 6 Jul 2021 00:36:46 -0400
Subject: sync with archiso v55

Imported changes:
0bc6294 (tag: v55) Merge branch 'changelog/55'
5751de9 Add changelog for v55
50c5a02 Merge branch 'mr/118'
d3b06a0 Add pv to the list of releng packages
ef9207d Merge remote-tracking branch 'nl6720/baseline-erofs'
0b94b04 configs/baseline: use EROFS based image
85c7cbe Merge remote-tracking branch 'nl6720/networkd-replace-type-with-name'
3b2618f configs/releng/airootfs/etc/systemd/network/: match by globbing the interface name instead of matching the type
254194a Merge branch 'issues/135'
0e61ed0 Adjust documentation on IRC support channel
e3a7f02 Merge remote-tracking branch 'sxw/copytoram'
31427ec Apply copytoram Boot Option Menu Entries also to releng
15f4ef4 Fence add_binary for pv
9c783a8 Reorder UEFI boot menu entries
16742d1 Update README.bootparams
c9cdb6d Apply 1 suggestion(s) to 1 file(s)
bb503b9 add optional pv tool

Parabola changes:
* mkparabolaiso: fix _run_once function

Signed-off-by: David P <megver83@parabola.nu>
---
 parabolaiso/mkparabolaiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'parabolaiso/mkparabolaiso')

diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index db49ba7..0fa0f04 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -261,9 +261,9 @@ _mksignature() {
 
 # Helper function to run functions only one time.
 _run_once() {
-    if [[ ! -e "${work_dir}/${run_once_mode}.${1}" ]]; then
+    if [[ ! -e "${work_dir}/${run_once_mode}.${1}.${arch}" ]]; then
         "$1"
-        touch "${work_dir}/${run_once_mode}.${1}_${arch}"
+        touch "${work_dir}/${run_once_mode}.${1}.${arch}"
     fi
 }
 
-- 
cgit v1.2.2