diff options
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 | ||||
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 10 |
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 |