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-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 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