From ec869f65392d9b775ea5044bd2ab6d01134be5be Mon Sep 17 00:00:00 2001
From: fdupoux <fdupoux@users.sourceforge.net>
Date: Sat, 25 Jul 2020 14:18:04 +0100
Subject: [PATCH 1/2] Added numbers to patch files to specify the right order

---
 ...o-squashfs-options.patch => archiso-01-squashfs-options.patch} | 0
 ...o-fix-pxeboot-dhcp.patch => archiso-02-fix-pxeboot-dhcp.patch} | 0
 ...ces.patch => archiso-03-fix-pxeboot-multiple-interfaces.patch} | 0
 ...ow-spacesize.patch => archiso-04-increase-cow-spacesize.patch} | 0
 .../{archiso-add-loadsrm.patch => archiso-05-add-loadsrm.patch}   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename patches/{archiso-squashfs-options.patch => archiso-01-squashfs-options.patch} (100%)
 rename patches/{archiso-fix-pxeboot-dhcp.patch => archiso-02-fix-pxeboot-dhcp.patch} (100%)
 rename patches/{archiso-fix-pxeboot-multiple-interfaces.patch => archiso-03-fix-pxeboot-multiple-interfaces.patch} (100%)
 rename patches/{archiso-increase-cow-spacesize.patch => archiso-04-increase-cow-spacesize.patch} (100%)
 rename patches/{archiso-add-loadsrm.patch => archiso-05-add-loadsrm.patch} (100%)

diff --git a/patches/archiso-squashfs-options.patch b/patches/archiso-01-squashfs-options.patch
similarity index 100%
rename from patches/archiso-squashfs-options.patch
rename to patches/archiso-01-squashfs-options.patch
diff --git a/patches/archiso-fix-pxeboot-dhcp.patch b/patches/archiso-02-fix-pxeboot-dhcp.patch
similarity index 100%
rename from patches/archiso-fix-pxeboot-dhcp.patch
rename to patches/archiso-02-fix-pxeboot-dhcp.patch
diff --git a/patches/archiso-fix-pxeboot-multiple-interfaces.patch b/patches/archiso-03-fix-pxeboot-multiple-interfaces.patch
similarity index 100%
rename from patches/archiso-fix-pxeboot-multiple-interfaces.patch
rename to patches/archiso-03-fix-pxeboot-multiple-interfaces.patch
diff --git a/patches/archiso-increase-cow-spacesize.patch b/patches/archiso-04-increase-cow-spacesize.patch
similarity index 100%
rename from patches/archiso-increase-cow-spacesize.patch
rename to patches/archiso-04-increase-cow-spacesize.patch
diff --git a/patches/archiso-add-loadsrm.patch b/patches/archiso-05-add-loadsrm.patch
similarity index 100%
rename from patches/archiso-add-loadsrm.patch
rename to patches/archiso-05-add-loadsrm.patch

From d2f290f8e81e89af5b072e3bed3870d4d4021b68 Mon Sep 17 00:00:00 2001
From: fdupoux <fdupoux@users.sourceforge.net>
Date: Sat, 25 Jul 2020 14:49:56 +0100
Subject: [PATCH 2/2] Copy autorun scripts to new location when copytoram is
 enabled (#126)

---
 .../etc/systemd/scripts/sysresccd-autorun     |  2 +-
 patches/archiso-06-autorun-copytoram.patch    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 patches/archiso-06-autorun-copytoram.patch

diff --git a/airootfs/etc/systemd/scripts/sysresccd-autorun b/airootfs/etc/systemd/scripts/sysresccd-autorun
index ae27273..a5260b1 100755
--- a/airootfs/etc/systemd/scripts/sysresccd-autorun
+++ b/airootfs/etc/systemd/scripts/sysresccd-autorun
@@ -33,7 +33,7 @@ basedir='/var/autorun'
 autorunlog=basedir+'/log'
 autorunmnt=basedir+'/mnt'
 autoruntmp=basedir+'/tmp'
-defaultsrc=['/run/archiso/bootmnt','/var/autorun/cdrom','/root','/usr/share/sys.autorun']
+defaultsrc=['/run/archiso/bootmnt','/run/archiso/copytoram','/var/autorun/cdrom','/root','/usr/share/sys.autorun']
 ar_autoruns=['']+list('0123456789ABCDEF')
 cmdline=open('/proc/cmdline').read()
 autorunfiles=[]
diff --git a/patches/archiso-06-autorun-copytoram.patch b/patches/archiso-06-autorun-copytoram.patch
new file mode 100644
index 0000000..0910d57
--- /dev/null
+++ b/patches/archiso-06-autorun-copytoram.patch
@@ -0,0 +1,19 @@
+diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
+index 3eb7ac7..e4585af 100644
+--- a/archiso/initcpio/hooks/archiso
++++ b/archiso/initcpio/hooks/archiso
+@@ -247,6 +247,14 @@ archiso_mount_handler() {
+ 
+     _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs"
+ 
++    if [[ "${copytoram}" == "y" ]] && ls -lh /run/archiso/bootmnt/autorun* >/dev/null; then
++        msg -n ":: Copying autorun scripts to RAM..."
++        if ! cp /run/archiso/bootmnt/autorun* /run/archiso/copytoram/ ; then
++            echo "ERROR: while copy '/run/archiso/bootmnt/autorun*' to '/run/archiso/copytoram/'"
++            launch_interactive_shell
++        fi
++    fi
++
+     [[ "${loadsrm}" == "y" ]] && _mnt_srm "/run/archiso/bootmnt/${archisobasedir}"
+ 
+     if [[ -f "/run/archiso/sfs/airootfs/airootfs.img" ]]; then