Merge branch 'master' into 'master'

Include SystemRescueModules in the produced iso

See merge request systemrescue/systemrescue-sources!107

README.md

@@ -29,3 +29,10 @@ custom packages can be accessed.
 The build process can be started by running the build.sh script. It will create
 a large "work" sub-directory and the ISO file will be written in the "out"
 sub-directory.
+
+## Including your SystemRescueModules
+If you want to include your own [SystemRescueModules][srm], place their srm files
+in the [srm](./srm) directory of the repository before running the build script.
+
+[srm]: https://www.system-rescue.org/Modules/
+

build.sh

@@ -239,6 +239,13 @@ make_prepare() {
 # Build ISO
 make_iso() {
     cp ${version_file} ${work_dir}/iso/${install_dir}/
+    (
+        shopt -s nullglob
+        rm -vf ${work_dir}/iso/${install_dir}/*.srm
+        for srm in srm/*.srm; do
+            cp -vf "$srm" ${work_dir}/iso/${install_dir}/
+        done
+    )
     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"
 }