diff --git a/src/kernel-install/90-uki-copy.install b/src/kernel-install/90-uki-copy.install index e34c8dcdcf..465af49c80 100755 --- a/src/kernel-install/90-uki-copy.install +++ b/src/kernel-install/90-uki-copy.install @@ -73,7 +73,7 @@ else UKI_FILE="$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi" fi -ADDON_DIR="$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi.extra.d" +EXTRA_DIR="$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi.extra.d" # If there is a UKI named uki.efi on the staging area use that, if not use what # was passed in as $KERNEL_IMAGE but insist it has a .efi extension @@ -85,9 +85,9 @@ if [ -f "$KERNEL_INSTALL_STAGING_AREA/uki.efi" ]; then } for f in "$KERNEL_INSTALL_STAGING_AREA/uki.efi.extra.d"/*; do [ -f "$f" ] || continue - [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $f as $ADDON_DIR/$(basename "$f")" - install -D -m 0644 "$f" "$ADDON_DIR/$(basename "$f")" || { - echo "Error: could not copy '$f' to '$ADDON_DIR/$(basename "$f")'." >&2 + [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $f as $EXTRA_DIR/$(basename "$f")" + install -D -m 0644 "$f" "$EXTRA_DIR/$(basename "$f")" || { + echo "Error: could not copy '$f' to '$EXTRA_DIR/$(basename "$f")'." >&2 exit 1 } done @@ -107,9 +107,9 @@ elif [ -n "$KERNEL_IMAGE" ]; then } for f in "$KERNEL_IMAGE.extra.d"/* "$KERNEL_INSTALL_STAGING_AREA/uki.efi.extra.d"/*; do [ -f "$f" ] || continue - [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $f as $ADDON_DIR/$(basename "$f")" - install -D -m 0644 "$f" "$ADDON_DIR/$(basename "$f")" || { - echo "Error: could not copy '$f' to '$ADDON_DIR/$(basename "$f")'." >&2 + [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $f as $EXTRA_DIR/$(basename "$f")" + install -D -m 0644 "$f" "$EXTRA_DIR/$(basename "$f")" || { + echo "Error: could not copy '$f' to '$EXTRA_DIR/$(basename "$f")'." >&2 exit 1 } done