mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove /usr/bin references
This commit is contained in:
parent
e80b029bc2
commit
aa282bd47e
3 changed files with 21 additions and 21 deletions
|
@ -495,8 +495,8 @@ default archlinux-core-main
|
|||
GUMEOF
|
||||
uefi_mount_efivarfs
|
||||
chroot_mount
|
||||
chroot "${DESTDIR}" "/usr/bin/bootctl" --path="${UEFISYS_MP}" install >"${LOG}" 2>&1
|
||||
chroot "${DESTDIR}" "/usr/bin/bootctl" --path="${UEFISYS_MP}" update >"${LOG}" 2>&1
|
||||
chroot "${DESTDIR}" bootctl --path="${UEFISYS_MP}" install >"${LOG}" 2>&1
|
||||
chroot "${DESTDIR}" bootctl --path="${UEFISYS_MP}" update >"${LOG}" 2>&1
|
||||
chroot_umount
|
||||
if [[ -e "${DESTDIR}/${UEFISYS_MP}/EFI/systemd/systemd-boot${_SPEC_UEFI_ARCH}.efi" ]]; then
|
||||
rm -f "${DESTDIR}/${UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
||||
|
@ -583,20 +583,20 @@ do_grub_common_before() {
|
|||
|
||||
do_grub_config() {
|
||||
chroot_mount
|
||||
BOOT_PART_FS_UUID="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs_uuid" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS_LABEL="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs_label" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_HINTS_STRING="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="hints_string" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_DRIVE="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="drive" "/boot" 2>/dev/null)"
|
||||
ROOT_PART_FS_UUID="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs_uuid" "/" 2>/dev/null)"
|
||||
ROOT_PART_HINTS_STRING="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="hints_string" "/" 2>/dev/null)"
|
||||
ROOT_PART_FS="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs" "/" 2>/dev/null)"
|
||||
USR_PART_FS_UUID="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs_uuid" "/usr" 2>/dev/null)"
|
||||
USR_PART_HINTS_STRING="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="hints_string" "/usr" 2>/dev/null)"
|
||||
USR_PART_FS="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs" "/usr" 2>/dev/null)"
|
||||
BOOT_PART_FS_UUID="$(chroot "${DESTDIR}" grub-probe --target="fs_uuid" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS_LABEL="$(chroot "${DESTDIR}" grub-probe --target="fs_label" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_HINTS_STRING="$(chroot "${DESTDIR}" grub-probe --target="hints_string" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_FS="$(chroot "${DESTDIR}" grub-probe --target="fs" "/boot" 2>/dev/null)"
|
||||
BOOT_PART_DRIVE="$(chroot "${DESTDIR}" grub-probe --target="drive" "/boot" 2>/dev/null)"
|
||||
ROOT_PART_FS_UUID="$(chroot "${DESTDIR}" grub-probe --target="fs_uuid" "/" 2>/dev/null)"
|
||||
ROOT_PART_HINTS_STRING="$(chroot "${DESTDIR}" grub-probe --target="hints_string" "/" 2>/dev/null)"
|
||||
ROOT_PART_FS="$(chroot "${DESTDIR}" grub-probe --target="fs" "/" 2>/dev/null)"
|
||||
USR_PART_FS_UUID="$(chroot "${DESTDIR}" grub-probe --target="fs_uuid" "/usr" 2>/dev/null)"
|
||||
USR_PART_HINTS_STRING="$(chroot "${DESTDIR}" grub-probe --target="hints_string" "/usr" 2>/dev/null)"
|
||||
USR_PART_FS="$(chroot "${DESTDIR}" grub-probe --target="fs" "/usr" 2>/dev/null)"
|
||||
if [[ "${GRUB_UEFI}" == "1" ]]; then
|
||||
UEFISYS_PART_FS_UUID="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="fs_uuid" "/${UEFISYS_MP}" 2>/dev/null)"
|
||||
UEFISYS_PART_HINTS_STRING="$(chroot "${DESTDIR}" /usr/bin/grub-probe --target="hints_string" "/${UEFISYS_MP}" 2>/dev/null)"
|
||||
UEFISYS_PART_FS_UUID="$(chroot "${DESTDIR}" grub-probe --target="fs_uuid" "/${UEFISYS_MP}" 2>/dev/null)"
|
||||
UEFISYS_PART_HINTS_STRING="$(chroot "${DESTDIR}" grub-probe --target="hints_string" "/${UEFISYS_MP}" 2>/dev/null)"
|
||||
fi
|
||||
if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then
|
||||
subdir="/boot"
|
||||
|
@ -904,7 +904,7 @@ do_grub_bios() {
|
|||
# freeze and unfreeze xfs filesystems to enable grub(2) installation on xfs filesystems
|
||||
freeze_xfs
|
||||
chroot_mount
|
||||
chroot "${DESTDIR}" "/usr/bin/grub-install" \
|
||||
chroot "${DESTDIR}" grub-install \
|
||||
--directory="/usr/lib/grub/i386-pc" \
|
||||
--target="i386-pc" \
|
||||
--boot-directory="/boot" \
|
||||
|
@ -941,7 +941,7 @@ do_grub_uefi() {
|
|||
GRUB_PREFIX_DIR="${UEFISYS_MP}/EFI/BOOT/"
|
||||
else
|
||||
## Install GRUB
|
||||
chroot "${DESTDIR}" "/usr/bin/grub-install" \
|
||||
chroot "${DESTDIR}" grub-install \
|
||||
--directory="/usr/lib/grub/${_GRUB_ARCH}-efi" \
|
||||
--target="${_GRUB_ARCH}-efi" \
|
||||
--efi-directory="${UEFISYS_MP}" \
|
||||
|
|
|
@ -89,9 +89,9 @@ run_mkinitcpio() {
|
|||
chroot_mount
|
||||
echo "Initramfs progress ..." > /tmp/mkinitcpio.log
|
||||
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
|
||||
chroot "${DESTDIR}" /usr/bin/mkinitcpio -p "${KERNELPKG}"-"${RUNNING_ARCH}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
|
||||
chroot "${DESTDIR}" mkinitcpio -p "${KERNELPKG}"-"${RUNNING_ARCH}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
|
||||
else
|
||||
chroot "${DESTDIR}" /usr/bin/mkinitcpio -p "${KERNELPKG}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
|
||||
chroot "${DESTDIR}" mkinitcpio -p "${KERNELPKG}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
|
||||
fi
|
||||
echo $? > /tmp/.mkinitcpio-retcode
|
||||
if [[ $(cat /tmp/.mkinitcpio-retcode) -ne 0 ]]; then
|
||||
|
|
|
@ -105,7 +105,7 @@ update_environment() {
|
|||
DIALOG --defaultno --yesno "New online kernel version ${ONLINE_KERNEL} available.\n\nDo you want to update the archboot environment to latest packages with caching packages for installation?\n\nATTENTION:\nThis will reboot the system using kexec!" 0 0 && UPDATE_ENVIRONMENT="1"
|
||||
if [[ "${UPDATE_ENVIRONMENT}" == "1" ]]; then
|
||||
DIALOG --infobox "Now setting up new archboot environment and dowloading latest packages.\n\nRunning at the moment: update-installer -latest-install\nCheck ${VC} console (ALT-F${VC_NUM}) for progress...\n\nGet a cup of coffee ...\nDepending on your system's setup, this needs about 5 minutes.\nPlease be patient." 0 0
|
||||
/usr/bin/update-installer -latest-install > "${LOG}" 2>&1
|
||||
update-installer -latest-install > "${LOG}" 2>&1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue