mirror of
https://github.com/nchevsky/systemrescue-zfs.git
synced 2025-12-06 07:12:01 +01:00
Allow autorun scripts to be located in a folder at the root of the ISO
This commit is contained in:
parent
add60264a2
commit
bc817e38bb
0
autorun/.gitkeep
Normal file
0
autorun/.gitkeep
Normal file
6
build.sh
6
build.sh
|
|
@ -347,8 +347,13 @@ make_prepare() {
|
||||||
|
|
||||||
# Build ISO
|
# Build ISO
|
||||||
make_iso() {
|
make_iso() {
|
||||||
|
# Copy version file
|
||||||
cp ${version_file} ${work_dir}/iso/${install_dir}/
|
cp ${version_file} ${work_dir}/iso/${install_dir}/
|
||||||
|
# Copy autorun folder
|
||||||
|
test -d autorun && cp -r autorun ${work_dir}/iso/
|
||||||
|
# Copy configuration files
|
||||||
cp -r sysrescue.d/ ${work_dir}/iso/
|
cp -r sysrescue.d/ ${work_dir}/iso/
|
||||||
|
# Copy SRM modules
|
||||||
(
|
(
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
rm -vf ${work_dir}/iso/${install_dir}/*.srm
|
rm -vf ${work_dir}/iso/${install_dir}/*.srm
|
||||||
|
|
@ -356,6 +361,7 @@ make_iso() {
|
||||||
cp -vf "$srm" ${work_dir}/iso/${install_dir}/
|
cp -vf "$srm" ${work_dir}/iso/${install_dir}/
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
|
# Create the ISO image
|
||||||
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch/x86_64/amd64}.iso"
|
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch/x86_64/amd64}.iso"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ diff -urN archiso-43-a/archiso/initcpio/hooks/archiso archiso-43-b/archiso/initc
|
||||||
+ if [[ "${copytoram}" == "y" ]]; then
|
+ if [[ "${copytoram}" == "y" ]]; then
|
||||||
+ if ls -lh /run/archiso/bootmnt/autorun* >/dev/null 2>/dev/null; then
|
+ if ls -lh /run/archiso/bootmnt/autorun* >/dev/null 2>/dev/null; then
|
||||||
+ msg ":: Copying autorun scripts to RAM ..."
|
+ msg ":: Copying autorun scripts to RAM ..."
|
||||||
+ if ! cp /run/archiso/bootmnt/autorun* /run/archiso/copytoram/ ; then
|
+ if ! cp -r /run/archiso/bootmnt/autorun* /run/archiso/copytoram/ ; then
|
||||||
+ echo "ERROR: failed to copy '/run/archiso/bootmnt/autorun*' to '/run/archiso/copytoram/'"
|
+ echo "ERROR: failed to copy '/run/archiso/bootmnt/autorun*' to '/run/archiso/copytoram/'"
|
||||||
+ launch_interactive_shell
|
+ launch_interactive_shell
|
||||||
+ fi
|
+ fi
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue