From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id 8E4516AC4B for ; Thu, 6 Oct 2016 20:59:16 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 06 Oct 2016 13:59:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,454,1473145200"; d="scan'208";a="1041335899" Received: from swold-mobl2.amr.corp.intel.com ([10.255.86.96]) by orsmga001.jf.intel.com with ESMTP; 06 Oct 2016 13:59:18 -0700 Message-ID: <1475787557.18115.216.camel@intel.com> From: Saul Wold To: openembedded-core@lists.openembedded.org, richard.purdie@linuxfoundation.org Date: Thu, 06 Oct 2016 13:59:17 -0700 In-Reply-To: <1474985736-17783-1-git-send-email-sgw@linux.intel.com> References: <1474985736-17783-1-git-send-email-sgw@linux.intel.com> X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Cc: Ross Burton Subject: Re: [PATCH][Jethro] init-install.sh: fix disk_size X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2016 20:59:18 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Ping On Tue, 2016-09-27 at 07:15 -0700, Saul Wold wrote: > From: Robert Yang > > It mis-matched "SanDisk" or "Disk Flags" before, which caused > unexpected > error. > > Signed-off-by: Robert Yang > Signed-off-by: Richard Purdie > (cherry picked from commit a68ac76c1b6ed4c1a2fbc944c5021c89fd26217f) > [YOCTO #10333] > Signed-off-by: Saul Wold > --- > This is fixed in both Master and Krogoth and just needs a backport to > Jethro to address an open bug. > >  meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2 > +- >  meta/recipes-core/initrdscripts/files/init-install-efi.sh        | 2 > +- >  meta/recipes-core/initrdscripts/files/init-install.sh            | 2 > +- >  3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi- > testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi- > testfs.sh > index 7a0b4d4..b562109 100644 > --- a/meta/recipes-core/initrdscripts/files/init-install-efi- > testfs.sh > +++ b/meta/recipes-core/initrdscripts/files/init-install-efi- > testfs.sh > @@ -69,7 +69,7 @@ umount /dev/${device}* 2> /dev/null || /bin/true >  mkdir -p /tmp >  cat /proc/mounts > /etc/mtab >   > -disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut > -d" " -f 3 | sed -e "s/MB//") > +disk_size=$(parted /dev/${device} unit mb print | grep '^Disk .*: > .*MB' | cut -d" " -f 3 | sed -e "s/MB//") >   >  testfs_size=$((disk_size*testfs_ratio/100)) >  rootfs_size=$((disk_size-boot_size-testfs_size)) > diff --git a/meta/recipes-core/initrdscripts/files/init-install- > efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > index 0443a9d..3531158 100644 > --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh > +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > @@ -120,7 +120,7 @@ if [ ! -e /etc/mtab ]; then >      cat /proc/mounts > /etc/mtab >  fi >   > -disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " > -f 3 | sed -e "s/MB//") > +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | > cut -d" " -f 3 | sed -e "s/MB//") >   >  swap_size=$((disk_size*swap_ratio/100)) >  rootfs_size=$((disk_size-boot_size-swap_size)) > diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh > b/meta/recipes-core/initrdscripts/files/init-install.sh > index f9e9768..06f03ed 100644 > --- a/meta/recipes-core/initrdscripts/files/init-install.sh > +++ b/meta/recipes-core/initrdscripts/files/init-install.sh > @@ -116,7 +116,7 @@ if [ ! -L /etc/mtab ]; then >      cat /proc/mounts > /etc/mtab >  fi >   > -disk_size=$(parted ${device} unit mb print | grep Disk | cut -d" " > -f 3 | sed -e "s/MB//") > +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | > cut -d" " -f 3 | sed -e "s/MB//") >   >  grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') >   > --  > 2.7.4 >