diff --git a/usr/lib/archboot/bootloader.sh b/usr/lib/archboot/bootloader.sh index 0a08bd173..a0f1ec9f8 100644 --- a/usr/lib/archboot/bootloader.sh +++ b/usr/lib/archboot/bootloader.sh @@ -22,7 +22,7 @@ _prepare_shim_files () { bsdtar -C "${_SHIM}" -xf "${_SHIM}"/*.rpm bsdtar -C "${_SHIM32}" -xf "${_SHIM32}"/*.rpm bsdtar -C "${_SHIMAA64}" -xf "${_SHIMAA64}"/*.rpm - echo "Copy shim files..." + echo "Copying shim files..." mkdir -m 777 shim-fedora cp "${_SHIM}"/boot/efi/EFI/fedora/{mmx64.efi,shimx64.efi} shim-fedora/ cp "${_SHIM}/boot/efi/EFI/fedora/shimx64.efi" shim-fedora/BOOTX64.efi diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh index 16c7728e8..9f6bfbd14 100644 --- a/usr/lib/archboot/common.sh +++ b/usr/lib/archboot/common.sh @@ -101,7 +101,7 @@ _x86_64_pacman_use_default() { if [[ -z "${_CUSTOM_PACMAN_CONF}" ]]; then echo "Use system's ${_PACMAN_CONF}..." else - echo "Copy ${_CUSTOM_PACMAN_CONF} to ${_PACMAN_CONF}..." + echo "Copying ${_CUSTOM_PACMAN_CONF} to ${_PACMAN_CONF}..." cp "${_PACMAN_CONF}" "${_PACMAN_CONF}".old cp "${_CUSTOM_PACMAN_CONF}" "${_PACMAN_CONF}" fi @@ -109,7 +109,7 @@ _x86_64_pacman_use_default() { if [[ -z "${_CUSTOM_MIRRORLIST}" ]]; then echo "Use system's ${_PACMAN_MIRROR}..." else - echo "Copy ${_CUSTOM_MIRRORLIST} to ${_PACMAN_MIRROR}..." + echo "Copying ${_CUSTOM_MIRRORLIST} to ${_PACMAN_MIRROR}..." cp "${_PACMAN_MIRROR}" "${_PACMAN_MIRROR}".old cp "${_CUSTOM_MIRRORLIST}" "${_PACMAN_MIRROR}" fi diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index 83f4b5a48..98c56873f 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -176,7 +176,7 @@ _copy_mirrorlist_and_pacman_conf() { } _copy_archboot_defaults() { - echo "Copy archboot defaults to container..." + echo "Copying archboot defaults to container..." cp /etc/archboot/defaults "${1}"/etc/archboot/defaults } diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh index aaaa652ec..f7404e70a 100644 --- a/usr/lib/archboot/iso.sh +++ b/usr/lib/archboot/iso.sh @@ -183,7 +183,7 @@ _prepare_uefi_image() { VFAT_IMAGE="${_ISODIR}/efi.img" ## Creating efi.img mkfs.vfat --invariant -C "${VFAT_IMAGE}" "${IMGSZ}" >/dev/null - ## Copy all files to UEFI vfat image + ## Copying all files to UEFI vfat image mcopy -m -i "${VFAT_IMAGE}" -s "${_ISODIR}"/EFI ::/ } @@ -229,7 +229,7 @@ unit: sectors "${VFAT_IMAGE}"1 : start= 2048, type=83, bootable EOF mkfs.vfat --offset=2048 --invariant "${VFAT_IMAGE}" >/dev/null - ## Copy all files to UEFI vfat image + ## Copying all files to UEFI vfat image mcopy -m -i "${VFAT_IMAGE}"@@1048576 -s "${_ISODIR}"/boot ::/ mv "${VFAT_IMAGE}" "${_IMAGENAME}.img" echo "Remove extlinux config file..."