From 8450317a6cbcc0b3e5ec00b266608ee1740d906c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 16 May 2013 13:48:42 +0000 Subject: 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 --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 1 + meta/recipes-core/initrdscripts/files/init-install.sh | 1 + meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | 2 +- meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 2 +- 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* 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 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 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//") 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" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-install-efi.sh" -PR = "r1" +PR = "r0" RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" 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" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-install.sh" -PR = "r9" +PR = "r8" RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" -- cgit v1.2.3-54-g00ecf