[PATCH 0/2] EFI Installer Fixes

[PATCH 0/2] EFI Installer Fixes

[Darren Hart]

Fix two bugs reported against the efi installer script when testing on the
MinnowBoard.

Patches have been tested together, successfully installing from USB to SD on the
MinnowBoard and booting without any manual manipulation of the installation
media after the fact.

The following changes since commit bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0:

  glib-2.0: fix broken python script header on machines using buildtools (2013-09-22 12:23:35 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib dvhart/efi-installer
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/efi-installer

Darren Hart (2):
  init-install-efi.sh: Fix root= specification
  init-install-efi.sh: Remove unnecessary udev rules file to avoid
    errors

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

-- 
1.7.9.5

[PATCH 1/2] init-install-efi.sh: Fix root= specification

[Darren Hart]

Fixes [YOCTO #5237]

The current grub.cfg manipulation depends on an existing root=
parameter. If this doesn't exist, the correct root= parameter will not
be added.

Instead, remove any existing root= parameters and add the correct one
explicitly.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: mihaix.lindner@linux.intel.com
---
 .../initrdscripts/files/init-install-efi.sh        |    6 ++++--
 1 file 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 23228c9..574966e 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -161,8 +161,10 @@ sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
 sed -i "/initrd /d" $GRUBCFG
 # Delete any LABEL= strings
 sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
-# Replace the ramdisk root with the install device and include other options
-sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG
+# Delete any root= strings
+sed -i "s/ root=[^ ]*/ /" $GRUBCFG
+# Add the root= and other standard boot options
+sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @" $GRUBCFG
 
 umount /ssd
 sync
-- 
1.7.9.5

[PATCH 2/2] init-install-efi.sh: Remove unnecessary udev rules file to avoid errors

[Darren Hart]

Fixes [YOCTO #5233]

Modeled after Chen Qi's fix to [YOCTO #3924] from oe-core commit:
6b6db7b4fb7aa17b8e29076decc830149b9d35bc
init-install.sh: remove unnecessary udev rules file to avoid error messages

/etc/udev/scripts/mount.sh is removed by init-install-efi.sh, but the
udev rules file which specifies the invocation of this script is not
removed, thus causing the error message during a live install:

/etc/udev/scripts/mount.sh: No such file or directory

The /etc/udev/rules/automount.rules no longer works once the mount.sh
script is removed. Remove it to avoid the error message.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: mihaix.lindner@linux.intel.com
---
 .../initrdscripts/files/init-install-efi.sh        |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 574966e..9846637 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -58,6 +58,7 @@ echo "Installing image on /dev/${device}"
 #
 # The udev automounter can cause pain here, kill it
 #
+rm -f /etc/udev/rules.d/automount.rules
 rm -f /etc/udev/scripts/mount*
 
 #
-- 
1.7.9.5

Re: [PATCH 0/2] EFI Installer Fixes

[Mihai Lindner]

On Mon, 2013-09-23 at 13:54 -0700, Darren Hart wrote:
> Fix two bugs reported against the efi installer script when testing on the
> MinnowBoard.
> 
> Patches have been tested together, successfully installing from USB to SD on the
> MinnowBoard and booting without any manual manipulation of the installation
> media after the fact.
> 
> The following changes since commit bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0:
> 
>   glib-2.0: fix broken python script header on machines using buildtools (2013-09-22 12:23:35 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib dvhart/efi-installer
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/efi-installer
> 
> Darren Hart (2):
>   init-install-efi.sh: Fix root= specification
>   init-install-efi.sh: Remove unnecessary udev rules file to avoid
>     errors
> 
>  .../initrdscripts/files/init-install-efi.sh        |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 

Both fixed; tested here also.

Thanks,

--
Mihai Lindner
Yocto Project QA
Intel OTC