summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-14 23:05:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:38:15 +0100
commitef2c6df7fcfd02ed45637f2e6b48f324d7a56b88 (patch)
tree541c4271cb7b1eddbc14046c08cffe9a24cff39f /meta
parent945a5172c2b996f0f307813d061250c39f77ebd2 (diff)
downloadopenembedded-core-ef2c6df7fcfd02ed45637f2e6b48f324d7a56b88.tar.gz
openembedded-core-ef2c6df7fcfd02ed45637f2e6b48f324d7a56b88.tar.bz2
openembedded-core-ef2c6df7fcfd02ed45637f2e6b48f324d7a56b88.zip
init-install: Specify partition name in parted command line
parted allows to use names for partitions if GPT partition table is used on the device. msdos partitioning can have only partition types: 'primary', 'logical' or 'extended'. Used meaningful partition names in parted command line for GPT partitioning. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh6
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh10
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 7f3e889f32..a6a86790c8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -134,14 +134,14 @@ echo "Creating new partition table on /dev/${device} ..."
parted /dev/${device} mklabel gpt
echo "Creating boot partition on $bootfs"
-parted /dev/${device} mkpart primary fat32 0% $boot_size
+parted /dev/${device} mkpart boot fat32 0% $boot_size
parted /dev/${device} set 1 boot on
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
+parted /dev/${device} mkpart root ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary linux-swap $swap_start 100%
+parted /dev/${device} mkpart swap linux-swap $swap_start 100%
parted /dev/${device} print
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 10aed074aa..c57a0f3700 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -163,17 +163,19 @@ if [ $grub_version -eq 0 ] ; then
else
parted /dev/${device} mktable gpt
echo "Creating BIOS boot partition on $bios_boot"
- parted /dev/${device} mkpart primary 0% $bios_boot_size
+ parted /dev/${device} mkpart bios_boot 0% $bios_boot_size
parted /dev/${device} set 1 bios_grub on
echo "Creating boot partition on $bootfs"
- parted /dev/${device} mkpart primary ext3 $boot_start $boot_size
+ parted /dev/${device} mkpart boot ext3 $boot_start $boot_size
fi
echo "Creating rootfs partition on $rootfs"
-parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end
+[ $grub_version -eq 0 ] && pname='primary' || pname='root'
+parted /dev/${device} mkpart $pname ext3 $rootfs_start $rootfs_end
echo "Creating swap partition on $swap"
-parted /dev/${device} mkpart primary linux-swap $swap_start 100%
+[ $grub_version -eq 0 ] && pname='primary' || pname='swap'
+parted /dev/${device} mkpart $pname linux-swap $swap_start 100%
parted /dev/${device} print