mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 03:20:38 +02:00
change uki name to mkinitcpio default name
This commit is contained in:
parent
2fd1e969a3
commit
769a4e1e87
2 changed files with 6 additions and 6 deletions
|
@ -14,12 +14,12 @@ Unit=run_ukify.service
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
CONFEOF
|
CONFEOF
|
||||||
cat << CONFEOF > "${_DESTDIR}/etc/systemd/system/run_ukify.service"
|
cat << CONFEOF > "${_DESTDIR}/etc/systemd/system/run_ukify.service"
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Run systemd ukify
|
Description=Run systemd ukify
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStart="/usr/lib/systemd/ukify build --config=/etc/ukify.conf --output ${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi"
|
ExecStart="/usr/lib/systemd/ukify build --config=/etc/ukify.conf --output ${_UEFISYS_MP}/EFI/Linux/arch-linux.efi"
|
||||||
CONFEOF
|
CONFEOF
|
||||||
${_NSPAWN} systemctl enable run_ukify.path &>"${_NO_LOG}"
|
${_NSPAWN} systemctl enable run_ukify.path &>"${_NO_LOG}"
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,11 +24,11 @@ CONFEOF
|
||||||
_uki_install() {
|
_uki_install() {
|
||||||
_uki_autobuild
|
_uki_autobuild
|
||||||
_BOOTMGR_LABEL="Arch Linux - Unified Kernel Image"
|
_BOOTMGR_LABEL="Arch Linux - Unified Kernel Image"
|
||||||
_BOOTMGR_LOADER_PATH="/EFI/Linux/archlinux-linux.efi"
|
_BOOTMGR_LOADER_PATH="/EFI/Linux/arch-linux.efi"
|
||||||
_uefi_bootmgr_setup
|
_uefi_bootmgr_setup
|
||||||
mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
||||||
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
||||||
cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/arch-linux.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
||||||
sleep 2
|
sleep 2
|
||||||
_progress "100" "Unified Kernel Image has been setup successfully."
|
_progress "100" "Unified Kernel Image has been setup successfully."
|
||||||
sleep 2
|
sleep 2
|
||||||
|
@ -45,8 +45,8 @@ _uki_uefi() {
|
||||||
_geteditor || return 1
|
_geteditor || return 1
|
||||||
"${_EDITOR}" "${_CMDLINE}"
|
"${_EDITOR}" "${_CMDLINE}"
|
||||||
"${_EDITOR}" "${_UKIFY_CONFIG}"
|
"${_EDITOR}" "${_UKIFY_CONFIG}"
|
||||||
${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output "${_UEFISYS_MP}"/EFI/Linux/archlinux-linux.efi >>"${_LOG}"
|
${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output "${_UEFISYS_MP}"/EFI/Linux/arch-linux.efi >>"${_LOG}"
|
||||||
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi" ]]; then
|
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/arch-linux.efi" ]]; then
|
||||||
_uki_install | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0
|
_uki_install | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0
|
||||||
else
|
else
|
||||||
_dialog --title " ERROR " --no-mouse --infobox "Setting up Unified Kernel Image failed!" 3 60
|
_dialog --title " ERROR " --no-mouse --infobox "Setting up Unified Kernel Image failed!" 3 60
|
||||||
|
|
Loading…
Reference in a new issue