From 69d5d61eb872aedf734c6d32aaaa4366d1ca8e1e Mon Sep 17 00:00:00 2001
From: shawnli-van <43871303+shawnli-van@users.noreply.github.com>
Date: Mon, 31 Dec 2018 09:40:11 -0800
Subject: [PATCH] [devices]: Fix arista-convertfs for aligning flash via sfdisk
 in Jessie (#2402) (#2406)

The sfdisk in Jessie use unit Cylinder by default. To perform 1M
aligning partition, 2048 sector unit is desirable instead.
---
 files/initramfs-tools/arista-convertfs.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/initramfs-tools/arista-convertfs.j2 b/files/initramfs-tools/arista-convertfs.j2
index 85b1bc4133..896175bebc 100644
--- a/files/initramfs-tools/arista-convertfs.j2
+++ b/files/initramfs-tools/arista-convertfs.j2
@@ -170,7 +170,7 @@ umount "$root_mnt"
 
 # Create a new partition table (content in flash_dev will be deleted)
 err_msg="Error: repartitioning $flash_dev failed"
-cmd="echo '2048' | sfdisk $flash_dev || (sleep 3; blockdev --rereadpt $flash_dev && fdisk -l $flash_dev | grep -q ${root_dev}.*Linux)"
+cmd="echo '2048' | sfdisk -u S --force $flash_dev || (sleep 3; blockdev --rereadpt $flash_dev && fdisk -l $flash_dev | grep -q ${root_dev}.*Linux)"
 run_cmd "$cmd" "$err_msg"
 
 sleep 5