diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-05-15 17:36:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-20 14:53:00 +0100 |
commit | be0327b6a900be5434b6b1f08277faf2f65d5da8 (patch) | |
tree | ef2813264acabfb861f7b3cac097e977a7e73e04 /meta/recipes-core/initrdscripts/files/init-install-efi.sh | |
parent | fc5dfad6490d0b3f2529f84ae9dfbd6b00b5c380 (diff) | |
download | openembedded-core-be0327b6a900be5434b6b1f08277faf2f65d5da8.tar.gz |
initrdscripts: fix for /run/media
mount.sh in udev-extraconf was modified to use /run/media instead
of /media. Unfortunately, our scripts in initrdscripts have some
dependency on the auto-mounting mechanism proviced by udev-extraconf.
So these scripts should also be fixed to use /run/media instead /media,
otherwise, our live image cannot work correctly.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index ed3221b0a6..8bd70251cd 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -128,7 +128,7 @@ mkdir /rootmnt mkdir /bootmnt mount $rootfs /ssd -mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt +mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /rootmnt echo "Copying rootfs files..." cp -a /rootmnt/* /ssd @@ -150,13 +150,13 @@ mount $bootfs /ssd EFIDIR="/ssd/EFI/BOOT" mkdir -p $EFIDIR -cp /media/$1/vmlinuz /ssd +cp /run/media/$1/vmlinuz /ssd # Copy the efi loader -cp /media/$1/EFI/BOOT/*.efi $EFIDIR +cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR -if [ -f /media/$1/EFI/BOOT/grub.cfg ]; then +if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then GRUBCFG="$EFIDIR/grub.cfg" - cp /media/$1/EFI/BOOT/grub.cfg $GRUBCFG + cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG # Update grub config for the installed image # Delete the install entry sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG @@ -170,10 +170,10 @@ if [ -f /media/$1/EFI/BOOT/grub.cfg ]; then sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @" $GRUBCFG fi -if [ -d /media/$1/loader ]; then +if [ -d /run/media/$1/loader ]; then GUMMIBOOT_CFGS="/ssd/loader/entries/*.conf" # copy config files for gummiboot - cp -dr /media/$1/loader /ssd + cp -dr /run/media/$1/loader /ssd # delete the install entry rm -f /ssd/loader/entries/install.conf # delete the initrd lines |