[oe-commits] Saul Wold : Revert "initramfs-live-install*: fix the "install" boot option"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 7d50133dd5c955d97193cc26458ebbf84dbfe0a4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7d50133dd5c955d97193cc26458ebbf84dbfe0a4

Author: Saul Wold <sgw at linux.intel.com>
Date:   Thu May 16 21:03:06 2013 +0300

Revert "initramfs-live-install*: fix the "install" boot option"

This was not the correct fix for this issues, it turns out that
base-files package was getting installed un-intentionally when
rpm-postinsts was split out. The base-files recipe lays down the
link that caused the cat failure.

[YOCTO #4504]

This reverts commit 45e460d0846f0f660128dc06064b597ce40282b3.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../initrdscripts/files/init-install-efi.sh        |    1 +
 .../initrdscripts/files/init-install.sh            |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 9f7a9e7..23228c9 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -66,6 +66,7 @@ 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//")
 
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 2ecd333..d2a0db3 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -78,6 +78,7 @@ 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//")