summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index fc4908ef91..ac26bceceb 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -134,7 +134,7 @@ swap_start=$((rootfs_end))
134# 2) they are detected asynchronously (need rootwait) 134# 2) they are detected asynchronously (need rootwait)
135rootwait="" 135rootwait=""
136part_prefix="" 136part_prefix=""
137if [ ! "${device#mmcblk}" = "${device}" ]; then 137if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then
138 part_prefix="p" 138 part_prefix="p"
139 rootwait="rootwait" 139 rootwait="rootwait"
140fi 140fi
@@ -184,8 +184,8 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
184echo "Copying rootfs files..." 184echo "Copying rootfs files..."
185cp -a /src_root/* /tgt_root 185cp -a /src_root/* /tgt_root
186if [ -d /tgt_root/etc/ ] ; then 186if [ -d /tgt_root/etc/ ] ; then
187 boot_uuid=$(blkid -o value -s UUID ${device}1) 187 boot_uuid=$(blkid -o value -s UUID ${bootfs})
188 swap_part_uuid=$(blkid -o value -s PARTUUID ${device}3) 188 swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
189 echo "/dev/disk/by-partuuid/$swap_part_uuid swap swap defaults 0 0" >> /tgt_root/etc/fstab 189 echo "/dev/disk/by-partuuid/$swap_part_uuid swap swap defaults 0 0" >> /tgt_root/etc/fstab
190 echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab 190 echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab
191 # We dont want udev to mount our root device while we're booting... 191 # We dont want udev to mount our root device while we're booting...
@@ -206,7 +206,7 @@ mkdir -p $EFIDIR
206cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR 206cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
207 207
208if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then 208if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
209 root_part_uuid=$(blkid -o value -s PARTUUID ${device}2) 209 root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
210 GRUBCFG="$EFIDIR/grub.cfg" 210 GRUBCFG="$EFIDIR/grub.cfg"
211 cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG 211 cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
212 # Update grub config for the installed image 212 # Update grub config for the installed image