Patchwork [2/3] Revert "initramfs-live-install*: fix the "install" boot option"

login
register
mail settings
Submitter Saul Wold
Date May 16, 2013, 6:03 p.m.
Message ID <e2fdb0ddaf77f2801326bb896ed5470e29cd1d16.1368727195.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/50009/
State New
Headers show

Comments

Saul Wold - May 16, 2013, 6:03 p.m.
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.
---
 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(-)
Koen Kooi - May 17, 2013, 9:17 a.m.
Op 16 mei 2013, om 20:03 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven:

> 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.
> ---
> 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 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

Traditionally /etc/mtab is a symlink to /proc/mounts, not a copy of it.

Patch

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//")
 
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"
 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 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"
 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"