summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-16 13:48:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-16 17:15:58 (GMT)
commit8450317a6cbcc0b3e5ec00b266608ee1740d906c (patch)
treed4a3d7d045589e90ba9084a5f1a7f33f41298f0f
parent00ab7c884b614d23a4ce6c17f07c612ecc9c7319 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh1
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh1
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb2
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 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*
66umount /dev/${device}* 2> /dev/null || /bin/true 66umount /dev/${device}* 2> /dev/null || /bin/true
67 67
68mkdir -p /tmp 68mkdir -p /tmp
69cat /proc/mounts > /etc/mtab
69 70
70disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") 71disk_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 89e9ed4..2c4486a 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
77fi 77fi
78 78
79mkdir -p /tmp 79mkdir -p /tmp
80cat /proc/mounts > /etc/mtab
80 81
81disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") 82disk_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 264931f..8ad47d4 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"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-install-efi.sh" 4SRC_URI = "file://init-install-efi.sh"
5 5
6PR = "r1" 6PR = "r0"
7 7
8RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" 8RDEPENDS_${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 3a8836d..0f80f0e 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"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-install.sh" 4SRC_URI = "file://init-install.sh"
5 5
6PR = "r9" 6PR = "r8"
7 7
8RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" 8RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
9 9