summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files/init-install.sh
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-05-15 17:36:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-20 14:53:12 +0100
commit8293f564685d0f587ab63a107285625dc4f98f1c (patch)
treec66fce8fe0427cf08bf08cacf6ed422cddf6e19f /meta/recipes-core/initrdscripts/files/init-install.sh
parent77b4b25c360aaa311a481786ae32e06a2b29feb1 (diff)
downloadpoky-8293f564685d0f587ab63a107285625dc4f98f1c.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. (From OE-Core rev: be0327b6a900be5434b6b1f08277faf2f65d5da8) 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.sh')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 8e433d5eda..b1600030f5 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -151,7 +151,7 @@ mkdir -p /boot
151 151
152# Handling of the target root partition 152# Handling of the target root partition
153mount $rootfs /tgt_root 153mount $rootfs /tgt_root
154mount -o rw,loop,noatime,nodiratime /media/$1/$2 /src_root 154mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
155echo "Copying rootfs files..." 155echo "Copying rootfs files..."
156cp -a /src_root/* /tgt_root 156cp -a /src_root/* /tgt_root
157if [ -d /tgt_root/etc/ ] ; then 157if [ -d /tgt_root/etc/ ] ; then
@@ -194,7 +194,7 @@ if [ ! -f /boot/grub/grub.cfg ] ; then
194 echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst 194 echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst
195fi 195fi
196 196
197cp /media/$1/vmlinuz /boot/ 197cp /run/media/$1/vmlinuz /boot/
198 198
199umount /boot 199umount /boot
200 200