diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-16 13:48:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-16 20:15:58 +0300 |
commit | 8450317a6cbcc0b3e5ec00b266608ee1740d906c (patch) | |
tree | d4a3d7d045589e90ba9084a5f1a7f33f41298f0f | |
parent | 00ab7c884b614d23a4ce6c17f07c612ecc9c7319 (diff) | |
download | poky-8450317a6cbcc0b3e5ec00b266608ee1740d906c.tar.gz |
Revert "initramfs-live-install*: fix the "install" boot option"
This patch causes install to fail because /etc/mtab doesn't exist, so revert it
for now until the root problem is fixed.
[ YOCTO #4501 ]
This reverts commit 2f5d41f94c53aaf606de66891c37de0dbd86f54b.
(From OE-Core rev: 20ded0315924a083e07900a8a3308bd351b15a8b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 9f7a9e7c61..23228c92c4 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* | |||
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 | ||
69 | 70 | ||
70 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") | 71 | disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") |
71 | 72 | ||
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 89e9ed48cb..2c4486a149 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -77,6 +77,7 @@ if [ ! -b /dev/loop0 ] ; then | |||
77 | fi | 77 | fi |
78 | 78 | ||
79 | mkdir -p /tmp | 79 | mkdir -p /tmp |
80 | cat /proc/mounts > /etc/mtab | ||
80 | 81 | ||
81 | 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//") |
82 | 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 264931f9a3..8ad47d476b 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 = "r1" | 6 | PR = "r0" |
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 3a8836d5b9..0f80f0e28a 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 = "r9" | 6 | PR = "r8" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" | 8 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" |
9 | 9 | ||