diff --git a/README.rst b/README.rst index 4c17082..c4774c0 100644 --- a/README.rst +++ b/README.rst @@ -49,7 +49,7 @@ be lost on update). The examples below will assume an unmodified profile in a system location (unless noted otherwise). -It is advised to check the help information of the **mkarchiso**: +It is advised to consult the help output of **mkarchiso**: .. code:: bash @@ -60,7 +60,7 @@ Create images with packaged archiso .. code:: bash - mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile + mkarchiso -w path/to/work_dir -o path/to/out_dir path/to/profile Create images with local clone ------------------------------ @@ -69,13 +69,13 @@ Clone this repository and run: .. code:: bash - ./archiso/mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile + ./archiso/mkarchiso -w path/to/work_dir -o path/to/out_dir path/to/profile Testing ======= The convenience script **run_archiso** is provided to boot into the medium using qemu. -It is advised to read its help information: +It is advised to consult its help output: .. code:: bash @@ -91,7 +91,7 @@ Run the following to boot the iso using UEFI: .. code:: bash - run_archiso -i path/to/an/arch.iso -u + run_archiso -u -i path/to/an/arch.iso The script can of course also be executed from this repository: diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 2ccf7f0..0318aa6 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -20,17 +20,22 @@ img_name="${app_name}.iso" sfs_mode="sfs" sfs_comp="xz" gpg_key="" +override_gpg_key="" # profile defaults profile="" iso_name="${app_name}" iso_label="${app_name^^}" +override_iso_label="" iso_publisher="${app_name}" +override_iso_publisher="" iso_application="${app_name} iso" +override_iso_application="" iso_version="" install_dir="${app_name}" arch="$(uname -m)" pacman_conf="/etc/pacman.conf" +override_pacman_conf="" bootmodes=() @@ -105,36 +110,52 @@ _umount_efibootimg() { # $1: exit status number. _usage() { IFS='' read -r -d '' usagetext < - general options: - -B Directory of the archiso profile to build - -p PACKAGE(S) Package(s) to install, can be used multiple times - -C pacman configuration file. - Default: '${pacman_conf}' - -L