diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-04-15 11:33:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-16 12:06:50 +0100 |
commit | 19b40a4e088391730ad0ca01c4862fcc787e51e7 (patch) | |
tree | c15c1a16be494cc1cc03bb49da60fd338717a5d1 /meta/recipes-core | |
parent | 4a1620fcbf49707b66c869b82749439d794385c3 (diff) | |
download | poky-19b40a4e088391730ad0ca01c4862fcc787e51e7.tar.gz |
initramfs-live-install*: fix the "install" boot option
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]
(From OE-Core rev: f8663eac872882e94d956b1b604304e92b865766)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
4 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 23228c92c4..9f7a9e7c61 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -66,7 +66,6 @@ rm -f /etc/udev/scripts/mount* | |||
66 | umount /dev/${device}* 2> /dev/null || /bin/true | 66 | umount /dev/${device}* 2> /dev/null || /bin/true |
67 | 67 | ||
68 | mkdir -p /tmp | 68 | mkdir -p /tmp |
69 | cat /proc/mounts > /etc/mtab | ||
70 | 69 | ||
71 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 70 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") |
72 | 71 | ||
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index d2a0db3183..2ecd333f92 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -78,7 +78,6 @@ if [ ! -b /dev/loop0 ] ; then | |||
78 | fi | 78 | fi |
79 | 79 | ||
80 | mkdir -p /tmp | 80 | mkdir -p /tmp |
81 | cat /proc/mounts > /etc/mtab | ||
82 | 81 | ||
83 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 82 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") |
84 | 83 | ||
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index 8ad47d476b..264931f9a3 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install-efi.sh" | 4 | SRC_URI = "file://init-install-efi.sh" |
5 | 5 | ||
6 | PR = "r0" | 6 | PR = "r1" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" | 8 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" |
9 | 9 | ||
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 0f80f0e28a..3a8836d5b9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install.sh" | 4 | SRC_URI = "file://init-install.sh" |
5 | 5 | ||
6 | PR = "r8" | 6 | PR = "r9" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" | 8 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" |
9 | 9 | ||