diff options
| author | David P <megver83@parabola.nu> | 2021-08-14 19:59:43 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2021-08-14 20:02:12 -0400 |
| commit | 3cb2f96bb185feb0804ee2920b7331f21d35e97e (patch) | |
| tree | 5dbfbf5dc5ee71f763c72ea42b4bf4d4f2de44d6 /parabolaiso | |
| parent | 845a476957a00953445e2c7bbc1914e6700721c3 (diff) | |
move non-archiso configs to parabolaiso-configs.git
other changes:
* mkparabolaiso: set image_name_$arch variables at the beginning of _build_buildmode_bootstrap()
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso')
| -rwxr-xr-x | parabolaiso/mkparabolaiso | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 3259f27..20883b9 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -1506,9 +1506,13 @@ _build_iso_base() { # Build the bootstrap buildmode _build_buildmode_bootstrap() { local run_once_mode="${buildmode}" + # shellcheck disable=SC2034 + local image_name_armv7h="" + local image_name_i686="" + local image_name_x86_64="" if [[ "${arch}" == "dual" ]]; then - local image_name_i686="${iso_name}-bootstrap-${iso_version}-i686.tar.gz" - local image_name_x86_64="${iso_name}-bootstrap-${iso_version}-x86_64.tar.gz" + image_name_i686="${iso_name}-bootstrap-${iso_version}-i686.tar.gz" + image_name_x86_64="${iso_name}-bootstrap-${iso_version}-x86_64.tar.gz" local image_name="${image_name_i686} ${image_name_x86_64}" local buildmode_packages="${bootstrap_packages_dual}" # Set the package lists to use @@ -1522,10 +1526,6 @@ _build_buildmode_bootstrap() { [[ -d "${work_dir}" ]] || install -d -- "${work_dir}" install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir_i686}" "${pacstrap_dir_x86_64}" else - # shellcheck disable=SC2034 - local image_name_armv7h="" - local image_name_i686="" - local image_name_x86_64="" local image_name="${iso_name}-bootstrap-${iso_version}-${arch}.tar.gz" local buildmode_packages="${bootstrap_packages}" # Set the package list to use |