summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-14 16:26:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:38:15 +0100
commit4c223e0bd8770909dca1131580878eba6855e085 (patch)
tree8c573949450b2bd43c66d165668ba92cdc33873d /meta
parent9544ac920d65edb7ddb267482c84d6fc1b464912 (diff)
downloadopenembedded-core-4c223e0bd8770909dca1131580878eba6855e085.tar.gz
openembedded-core-4c223e0bd8770909dca1131580878eba6855e085.tar.bz2
openembedded-core-4c223e0bd8770909dca1131580878eba6855e085.zip
init-install: Implement UUID support
Used partition UUID in kernel command line to specify root partition. Searched root device by file system uuid in GRUB configuration. Used partition UUID in /etc/fstab to specify swap partition. Used filesystem UUID in /etc/fstab to specify boot partition. [YOCTO #6101] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh23
1 files changed, 17 insertions, 6 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 298ea8d529..9957c15ccf 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -196,8 +196,17 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
echo "Copying rootfs files..."
cp -a /src_root/* /tgt_root
if [ -d /tgt_root/etc/ ] ; then
- echo "$swap swap swap defaults 0 0" >> /tgt_root/etc/fstab
- echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
+ if [ $grub_version -ne 0 ] ; then
+ boot_uuid=$(blkid -o value -s UUID ${device}2)
+ swap_part_uuid=$(blkid -o value -s PARTUUID ${device}4)
+ bootdev="UUID=$boot_uuid"
+ swapdev=/dev/disk/by-partuuid/$swap_part_uuid
+ else
+ bootdev=${device}2
+ swapdev=${device}4
+ fi
+ echo "$swapdev swap swap defaults 0 0" >> /tgt_root/etc/fstab
+ echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
@@ -209,22 +218,24 @@ umount /src_root
# Handling of the target boot partition
mount $bootfs /boot
echo "Preparing boot partition..."
-if [ -f /etc/grub.d/00_header ] ; then
+if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
echo "Preparing custom grub2 menu..."
+ root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3)
+ boot_uuid=$(blkid -o value -s UUID /dev/${device}2)
GRUBCFG="/boot/grub/grub.cfg"
mkdir -p $(dirname $GRUBCFG)
cat >$GRUBCFG <<_EOF
menuentry "Linux" {
- set root=(hd0,2)
- linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet
+ search --no-floppy --fs-uuid $boot_uuid --set root
+ linux /vmlinuz root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet
}
_EOF
chmod 0444 $GRUBCFG
fi
grub-install /dev/${device}
-echo "(hd0) /dev/${device}" > /boot/grub/device.map
if [ $grub_version -eq 0 ] ; then
+ echo "(hd0) /dev/${device}" > /boot/grub/device.map
echo "Preparing custom grub menu..."
echo "default 0" > /boot/grub/menu.lst
echo "timeout 30" >> /boot/grub/menu.lst