EFI: Make installer EFI aware
[YOCTO #1919] Create a basic EFI installer script modeled after the existing installer and add it to a new initramfs-live-install-efi recipe. Update the init-live.sh script to distinguish between LABEL=install and LABEL=install-efi and select the appropriate script. Add the efi installer to core-image-minimal-initramfs. Update grub-efi.bbclass to use "LABEL=install-efi" when it detects a label of "install". This is clearly not ideal, but a proper fix would involve decoupling the LABELS assignment from the image-live.bbclass usage of SYSLINUX_LABELS. We should be able to address that in a follow-on clean-up series. V2: Include missing initramfs-live-install-efi_1.0.bb V3: Rebase after Radu's console_params fix (From OE-Core rev: 4bce3417917a3e88ba6529db394525fba82e0699) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Darren Hart
Richard Purdie
parent
d36fa9a883
commit
64f7feb5c3
|
|
@ -99,6 +99,8 @@ python build_grub_cfg() {
|
|||
bb.data.update_data(localdata)
|
||||
|
||||
cfgfile.write('\nmenuentry \'%s\'{\n' % (label))
|
||||
if label == "install":
|
||||
label = "install-efi"
|
||||
cfgfile.write('linux /vmlinuz LABEL=%s' % (label))
|
||||
|
||||
append = localdata.getVar('APPEND', True)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \
|
|||
the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
|
||||
first “init” program more efficiently."
|
||||
|
||||
IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd"
|
||||
IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd"
|
||||
|
||||
# Do not pollute the initrd image with rootfs features
|
||||
IMAGE_FEATURES = ""
|
||||
|
|
|
|||
|
|
@ -0,0 +1,175 @@
|
|||
#!/bin/sh -e
|
||||
#
|
||||
# Copyright (c) 2012, Intel Corporation.
|
||||
# All rights reserved.
|
||||
#
|
||||
# install.sh [device_name] [rootfs_name]
|
||||
#
|
||||
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
|
||||
# We need 20 Mb for the boot partition
|
||||
boot_size=20
|
||||
|
||||
# 5% for swap
|
||||
swap_ratio=5
|
||||
|
||||
found="no"
|
||||
|
||||
echo "Searching for a hard drive..."
|
||||
for device in 'hda' 'hdb' 'sda' 'sdb' 'mmcblk0' 'mmcblk1'
|
||||
do
|
||||
if [ -e /sys/block/${device}/removable ]; then
|
||||
if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
|
||||
found="yes"
|
||||
|
||||
while true; do
|
||||
# Try sleeping here to avoid getting kernel messages
|
||||
# obscuring/confusing user
|
||||
sleep 5
|
||||
echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
|
||||
read answer
|
||||
if [ "$answer" = "y" ] ; then
|
||||
break
|
||||
fi
|
||||
|
||||
if [ "$answer" = "n" ] ; then
|
||||
found=no
|
||||
break
|
||||
fi
|
||||
|
||||
echo "Please answer y or n"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$found" = "yes" ]; then
|
||||
break;
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
if [ "$found" = "no" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Installing image on /dev/${device}"
|
||||
|
||||
#
|
||||
# The udev automounter can cause pain here, kill it
|
||||
#
|
||||
rm -f /etc/udev/scripts/mount*
|
||||
|
||||
#
|
||||
# Unmount anything the automounter had mounted
|
||||
#
|
||||
umount /dev/${device}* 2> /dev/null || /bin/true
|
||||
|
||||
mkdir -p /tmp
|
||||
cat /proc/mounts > /etc/mtab
|
||||
|
||||
disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//")
|
||||
|
||||
swap_size=$((disk_size*swap_ratio/100))
|
||||
rootfs_size=$((disk_size-boot_size-swap_size))
|
||||
|
||||
rootfs_start=$((boot_size))
|
||||
rootfs_end=$((rootfs_start+rootfs_size))
|
||||
swap_start=$((rootfs_end))
|
||||
|
||||
# MMC devices are special in a couple of ways
|
||||
# 1) they use a partition prefix character 'p'
|
||||
# 2) they are detected asynchronously (need rootwait)
|
||||
rootwait=""
|
||||
part_prefix=""
|
||||
if [ ! "${device#mmcblk}" = "${device}" ]; then
|
||||
part_prefix="p"
|
||||
rootwait="rootwait"
|
||||
fi
|
||||
bootfs=/dev/${device}${part_prefix}1
|
||||
rootfs=/dev/${device}${part_prefix}2
|
||||
swap=/dev/${device}${part_prefix}3
|
||||
|
||||
echo "*****************"
|
||||
echo "Boot partition size: $boot_size MB ($bootfs)"
|
||||
echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
|
||||
echo "Swap partition size: $swap_size MB ($swap)"
|
||||
echo "*****************"
|
||||
echo "Deleting partition table on /dev/${device} ..."
|
||||
dd if=/dev/zero of=/dev/${device} bs=512 count=2
|
||||
|
||||
echo "Creating new partition table on /dev/${device} ..."
|
||||
parted /dev/${device} mklabel gpt
|
||||
|
||||
echo "Creating boot partition on $bootfs"
|
||||
parted /dev/${device} mkpart primary 0% $boot_size
|
||||
|
||||
echo "Creating rootfs partition on $rootfs"
|
||||
parted /dev/${device} mkpart primary $rootfs_start $rootfs_end
|
||||
|
||||
echo "Creating swap partition on $swap"
|
||||
parted /dev/${device} mkpart primary $swap_start 100%
|
||||
|
||||
parted /dev/${device} print
|
||||
|
||||
echo "Formatting $bootfs to vfat..."
|
||||
mkfs.vfat $bootfs
|
||||
|
||||
echo "Formatting $rootfs to ext3..."
|
||||
mkfs.ext3 $rootfs
|
||||
|
||||
echo "Formatting swap partition...($swap)"
|
||||
mkswap $swap
|
||||
|
||||
mkdir /ssd
|
||||
mkdir /rootmnt
|
||||
mkdir /bootmnt
|
||||
|
||||
mount $rootfs /ssd
|
||||
mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
|
||||
|
||||
echo "Copying rootfs files..."
|
||||
cp -a /rootmnt/* /ssd
|
||||
|
||||
if [ -d /ssd/etc/ ] ; then
|
||||
echo "$swap swap swap defaults 0 0" >> /ssd/etc/fstab
|
||||
|
||||
# We dont want udev to mount our root device while we're booting...
|
||||
if [ -d /ssd/etc/udev/ ] ; then
|
||||
echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist
|
||||
fi
|
||||
fi
|
||||
|
||||
umount /ssd
|
||||
umount /rootmnt
|
||||
|
||||
echo "Preparing boot partition..."
|
||||
mount $bootfs /ssd
|
||||
|
||||
EFIDIR="/ssd/EFI/BOOT"
|
||||
mkdir -p $EFIDIR
|
||||
GRUBCFG="$EFIDIR/grub.cfg"
|
||||
|
||||
cp /media/$1/vmlinuz /ssd
|
||||
# Copy the efi loader and config (booti*.efi and grub.cfg)
|
||||
cp /media/$1/EFI/BOOT/* $EFIDIR
|
||||
|
||||
# Update grub config for the installed image
|
||||
# Delete the install entry
|
||||
sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
|
||||
# Delete the initrd lines
|
||||
sed -i "/initrd /d" $GRUBCFG
|
||||
# Delete any LABEL= strings
|
||||
sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
|
||||
# Replace the ramdisk root with the install device and include other options
|
||||
sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG
|
||||
|
||||
umount /ssd
|
||||
sync
|
||||
|
||||
echo "Remove your installation media, and press ENTER"
|
||||
|
||||
read enter
|
||||
|
||||
echo "Rebooting..."
|
||||
reboot -f
|
||||
|
|
@ -116,11 +116,11 @@ case $label in
|
|||
fi
|
||||
fi
|
||||
;;
|
||||
install)
|
||||
install|install-efi)
|
||||
if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then
|
||||
./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
|
||||
./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
|
||||
else
|
||||
fatal "Could not find install script"
|
||||
fatal "Could not find $label script"
|
||||
fi
|
||||
|
||||
# If we're getting here, we failed...
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
DESCRIPTION = "A live image init script for grub-efi"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
SRC_URI = "file://init-install-efi.sh"
|
||||
|
||||
PR = "r0"
|
||||
|
||||
RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
|
||||
|
||||
do_install() {
|
||||
install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh
|
||||
}
|
||||
|
||||
# While this package maybe an allarch due to it being a
|
||||
# simple script, reality is that it is Host specific based
|
||||
# on the COMPATIBLE_HOST below, which needs to take precedence
|
||||
#inherit allarch
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
FILES_${PN} = " /install-efi.sh "
|
||||
|
||||
COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
|
||||
Loading…
Reference in New Issue