From 3fb8f54e849f66c9315317a17c481b381b93ccdb Mon Sep 17 00:00:00 2001
From: Marcos Mello <marcosfrm@gmail.com>
Date: Sun, 9 Aug 2020 21:29:11 -0300
Subject: [PATCH] srm patch: override airootfs files

It is counterintuitive otherwise.
---
 patches/archiso-v43-05-add-loadsrm.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/archiso-v43-05-add-loadsrm.patch b/patches/archiso-v43-05-add-loadsrm.patch
index 34a8a24..e6029ed 100644
--- a/patches/archiso-v43-05-add-loadsrm.patch
+++ b/patches/archiso-v43-05-add-loadsrm.patch
@@ -1,5 +1,5 @@
 diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
-index 5c56561..f99a617 100644
+index 5c56561..ed3c1fa 100644
 --- a/archiso/initcpio/hooks/archiso
 +++ b/archiso/initcpio/hooks/archiso
 @@ -72,6 +72,44 @@ _mnt_sfs() {
@@ -32,7 +32,7 @@ index 5c56561..f99a617 100644
 +        # SRM is optional, hence call mount directly
 +        msg ":: Mounting '${srm_dev}' to '/run/archiso/sfs/srm${srm_c}'"
 +        if mount -o ro,X-mount.mkdir "${srm_dev}" "/run/archiso/sfs/srm${srm_c}" ; then
-+            overlay_src_extra="${overlay_src_extra}:/run/archiso/sfs/srm${srm_c}"
++            overlay_src_extra="${overlay_src_extra}/run/archiso/sfs/srm${srm_c}:"
 +            echo ${srm_dev} >> /run/archiso/used_block_devices
 +            srm_c=$(( srm_c + 1 ))
 +            msg ":: Device '${srm_dev}' mounted successfully."
@@ -68,7 +68,7 @@ index 5c56561..f99a617 100644
          _mnt_dmsnapshot "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
      else
 -        _mnt_overlayfs "/run/archiso/sfs/airootfs" "${newroot}" "/"
-+        _mnt_overlayfs "/run/archiso/sfs/airootfs${overlay_src_extra}" "${newroot}" "/"
++        _mnt_overlayfs "${overlay_src_extra}/run/archiso/sfs/airootfs" "${newroot}" "/"
      fi
  
      if [[ "${copytoram}" == "y" ]]; then