root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge grub install into do_grub_before

Browse source
This commit is contained in:
Tobias Powalowski 2013-08-22 16:42:38 +02:00
parent a28060311e
commit 70e4beaea4
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
usr/share/archboot/installer/setup
View file

@ -4005,6 +4005,13 @@ do_grub_common_before() {
if ! [[ "$(dmraid -r | grep ^no )" ]]; then
DIALOG --yesno "Setup detected dmraid device.\nDo you want to install grub on this device?" 0 0 && USE_DMRAID="1"
fi
if [[ ! -f "${DESTDIR}/usr/lib/grub/i386-pc/kernel.img" ]]; then
DIALOG --msgbox "Couldn't find ${DESTDIR}/usr/lib/grub/i386-pc/kernel.img , installing grub pkg now ..." 0 0
PACKAGES="grub"
run_pacman
# reset PACKAGES after installing
unset PACKAGES
fi
}
do_grub_config() {
@ -4309,15 +4316,7 @@ EOF
do_grub_bios() {
do_grub_common_before
if [[ ! -f "${DESTDIR}/usr/lib/grub/i386-pc/kernel.img" ]]; then
DIALOG --msgbox "Couldn't find ${DESTDIR}/usr/lib/grub/i386-pc/kernel.img , installing grub pkg now ..." 0 0
PACKAGES="grub"
run_pacman
# reset PACKAGES after installing
unset PACKAGES
fi
# try to auto-configure GRUB(2)...
if [[ "${PART_ROOT}" != "" ]]; then
check_bootpart
@ -4451,13 +4450,7 @@ do_grub_uefi() {
[[ "${_UEFI_ARCH}" == "IA32" ]] && _GRUB_ARCH="i386"
do_grub_common_before
DIALOG --msgbox "Installing grub pkg now ..." 0 0
PACKAGES="grub"
run_pacman
# reset PACKAGES after installing
unset PACKAGES
chroot_mount
chroot "${DESTDIR}" "/usr/bin/grub-install" \