Skip to contentSkip to conversation

a bugfix for oecore layer

PATCH New [email protected] 1 participant 2 messages Apr 15, 2013

lore
Share & tools
lore
#0 lore raw

cover a bugfix for oecore layer

From: Nitin A Kamble <[email protected]>

Information on the bugfix is in the commit's header.

Thanks,
Nitin

The following changes since commit 45c8cc1a58e7868f4603be08a86fef178edfc926:

poky.conf: add Poky 1.4 and CentOS 6.4 to SANITY_TESTED_DISTROS (2013-04-15 17:21:28 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (1):
initramfs-live-install*: fix the "install" boot option

 .../initrdscripts/files/init-install-efi.sh        |    1 -
 .../initrdscripts/files/init-install.sh            |    1 -
 .../initramfs-live-install-efi_1.0.bb              |    2 +-
 .../initrdscripts/initramfs-live-install_1.0.bb    |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 initramfs-live-install*: fix the "install" boot option

From: Nitin A Kamble <[email protected]>

The install boot option was giving the following error when one tried to install the live image on a permanent storage of a BSP.

cat: write error Invalid argument
Installation image failed
sh: can't access tty: job control turned off

Further digging into the issue, found out that the install script was trying to do this:
cat /proc/mounts > /etc/mtab

And in the base-files recipe the /etc/mtab is made soft link to /proc/mounts. So the cat command was failing to write on /etc/mtab. As the contents of the /proc/mounts is already reflected in the /etc/mtab file due to the symlink-ing, there is no need for this step to recreate /etc/mtab in the install script. So just removing this unnecessary step, which solves the install issue of the live images.

Fixes this bug:
[YOCTO #4229]

---
 .../initrdscripts/files/init-install-efi.sh        |    1 -
 .../initrdscripts/files/init-install.sh            |    1 -
 .../initramfs-live-install-efi_1.0.bb              |    2 +-
 .../initrdscripts/initramfs-live-install_1.0.bb    |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-core/initrdscripts/files/init-install-efi.sh +0 -1
index 23228c9..9f7a9e7 100644
@@ -66,7 +66,6 @@ rm -f /etc/udev/scripts/mount*
 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//")
 
meta/recipes-core/initrdscripts/files/init-install.sh +0 -1
index d2a0db3..2ecd333 100644
@@ -78,7 +78,6 @@ if [ ! -b /dev/loop0 ] ; then
 fi
 
 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//")
 
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +1 -1
index 8ad47d4..264931f 100644
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-install-efi.sh"
 
-PR = "r0"
+PR = "r1"
 
 RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
 
meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +1 -1
index 0f80f0e..3a8836d 100644
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 SRC_URI = "file://init-install.sh"
 
-PR = "r8"
+PR = "r9"
 
 RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
 
Signature · 1 line
1.7.3.4